diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
index 4e497933ae4..b973d157a3d 100644
--- a/kura/distrib/pom.xml
+++ b/kura/distrib/pom.xml
@@ -1136,6 +1136,7 @@
     </dependencies>
 
     <profiles>
+
         <profile>
             <id>java8</id>
             <activation>
@@ -1145,6 +1146,7 @@
                 <skip.js.nashorn.engine.components>false</skip.js.nashorn.engine.components>
             </properties>
         </profile>
+
         <profile>
             <id>java17</id>
             <activation>
@@ -1154,8 +1156,10 @@
                 <skip.js.nashorn.engine.components>true</skip.js.nashorn.engine.components>
             </properties>
         </profile>
+
+        <!-- armhf -->
         <profile>
-            <id>generic-arm32</id>
+            <id>armhf</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1188,7 +1192,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-jars</id>
+                                <id>armhf-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1199,10 +1203,10 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-arm32" />
-                                        <property name="target.device" value="generic-arm32" />
+                                        <property name="build.name" value="armhf" />
+                                        <property name="target.device" value="armhf" />
                                         <property name="native.tag" value="armv6hf" />
-                                        <property name="kura.os.version" value="raspbian" />
+                                        <property name="kura.os.version" value="debian" />
                                         <property name="kura.arch" value="armv7_hf" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1218,18 +1222,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-deb</id>
+                                <id>armhf-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-arm32_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-arm32/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura_${project.version}_armhf.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/armhf/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-arm32.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_armhf.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1250,8 +1254,9 @@
             </build>
         </profile>
 
+        <!-- armhf-nn -->
         <profile>
-            <id>generic-arm32-nn</id>
+            <id>armhf-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1284,7 +1289,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-nn-jars</id>
+                                <id>armhf-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1295,10 +1300,10 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-arm32-nn" />
-                                        <property name="target.device" value="generic-arm32-nn" />
+                                        <property name="build.name" value="armhf-nn" />
+                                        <property name="target.device" value="armhf-nn" />
                                         <property name="native.tag" value="armv6hf" />
-                                        <property name="kura.os.version" value="raspbian" />
+                                        <property name="kura.os.version" value="debian" />
                                         <property name="kura.arch" value="armv7_hf" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1314,18 +1319,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-nn-deb</id>
+                                <id>armhf-nn-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-arm32-nn_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-arm32-nn/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura-nn_${project.version}_armhf.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/armhf-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-arm32-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_armhf-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1341,8 +1346,9 @@
             </build>
         </profile>
 
+        <!-- x86_64 -->
         <profile>
-            <id>generic-x86_64</id>
+            <id>x86_64</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1375,7 +1381,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-jars</id>
+                                <id>x86_64-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1386,10 +1392,10 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-x86_64" />
-                                        <property name="target.device" value="generic-x86_64" />
+                                        <property name="build.name" value="x86_64" />
+                                        <property name="target.device" value="x86_64" />
                                         <property name="native.tag" value="x86_64" />
-                                        <property name="kura.os.version" value="raspbian" />
+                                        <property name="kura.os.version" value="debian" />
                                         <property name="kura.arch" value="x86_64" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1405,18 +1411,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-deb</id>
+                                <id>x86_64-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-x86_64_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-x86_64/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura_${project.version}_amd64.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/x86_64/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-x86_64.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_x86_64.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1437,8 +1443,9 @@
             </build>
         </profile>
 
+        <!-- x86_64-nn -->
 		<profile>
-            <id>generic-x86_64-nn</id>
+            <id>x86_64-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1471,7 +1478,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-nn-jars</id>
+                                <id>x86_64-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1482,10 +1489,10 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-x86_64-nn" />
-                                        <property name="target.device" value="generic-x86_64-nn" />
+                                        <property name="build.name" value="x86_64-nn" />
+                                        <property name="target.device" value="x86_64-nn" />
                                         <property name="native.tag" value="x86_64" />
-                                        <property name="kura.os.version" value="raspbian" />
+                                        <property name="kura.os.version" value="debian" />
                                         <property name="kura.arch" value="x86_64" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1501,18 +1508,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-nn-deb</id>
+                                <id>x86_64-nn-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-x86_64-nn_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-x86_64-nn/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura-nn_${project.version}_amd64.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/x86_64-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-x86_64-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_x86_64-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1527,9 +1534,10 @@
                 </plugins>
             </build>
         </profile>
-        
+
+        <!-- aarch64 -->
         <profile>
-            <id>generic-aarch64</id>
+            <id>aarch64</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1562,7 +1570,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-jars</id>
+                                <id>aarch64-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1573,11 +1581,11 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-aarch64" />
-                                        <property name="target.device" value="generic-aarch64" />
+                                        <property name="build.name" value="aarch64" />
+                                        <property name="target.device" value="aarch64" />
                                         <property name="native.tag" value="aarch64" />
-                                        <property name="kura.os.version" value="raspbian" />
-                                        <property name="kura.arch" value="generic-arm64" />
+                                        <property name="kura.os.version" value="debian" />
+                                        <property name="kura.arch" value="aarch64" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
                                         <ant antfile="${basedir}/src/main/ant/build_equinox_distrib.xml" target="dist-linux" />
@@ -1592,18 +1600,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-deb</id>
+                                <id>aarch64-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-aarch64_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-aarch64/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura_${project.version}_arm64.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/aarch64/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-aarch64.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_aarch64.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1624,8 +1632,9 @@
             </build>
         </profile>
 
+        <!-- aarch64-nn -->
 		<profile>
-            <id>generic-aarch64-nn</id>
+            <id>aarch64-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1658,7 +1667,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-nn-jars</id>
+                                <id>aarch64-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1669,11 +1678,11 @@
                                         <property name="project.version" value="${project.version}" />
                                         <property name="project.build.profile" value="${project.build.profile}" />
                                         <property name="project.build.directory" value="${project.build.directory}" />
-                                        <property name="build.name" value="generic-aarch64-nn" />
-                                        <property name="target.device" value="generic-aarch64-nn" />
+                                        <property name="build.name" value="aarch64-nn" />
+                                        <property name="target.device" value="aarch64-nn" />
                                         <property name="native.tag" value="aarch64" />
-                                        <property name="kura.os.version" value="raspbian" />
-                                        <property name="kura.arch" value="generic-arm64" />
+                                        <property name="kura.os.version" value="debian" />
+                                        <property name="kura.arch" value="aarch64" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
                                         <ant antfile="${basedir}/src/main/ant/build_equinox_distrib.xml" target="dist-linux" />
@@ -1688,18 +1697,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-nn-deb</id>
+                                <id>aarch64-nn-deb</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>jdeb</goal>
                                 </goals>
                                 <configuration>
                                     <verbose>true</verbose>
-                                    <deb>${basedir}/target/kura_${project.version}_generic-aarch64-nn_installer.deb</deb>
-                                    <controlDir>${basedir}/src/main/resources/generic-aarch64-nn/deb/control</controlDir>
+                                    <deb>${basedir}/target/kura-nn_${project.version}_arm64.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/aarch64-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-aarch64-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_aarch64-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1715,6 +1724,8 @@
             </build>
         </profile>
         
+        <!-- dockers -->
+
         <profile>
             <id>docker-x86_64-nn</id>
             <activation>
@@ -1832,6 +1843,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>docker-ubi8-x86_64-nn</id>
             <activation>
@@ -1878,6 +1890,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>docker-alpine-x86_64-nn</id>
             <activation>
@@ -1925,6 +1938,7 @@
             </build>
         </profile>
 
+        <!-- dev-env -->
         <profile>
             <id>dev-env</id>
             <activation>
@@ -2273,6 +2287,9 @@
                 </plugins>
             </build>
         </profile>
+
+        <!-- dp -->
+
         <profile>
             <id>core-dp</id>
             <activation>
@@ -2400,6 +2417,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>can-dp</id>
             <activation>
@@ -2437,5 +2455,6 @@
                 </plugins>
             </build>
         </profile>
+
     </profiles>
 </project>
diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 7087be1ba8a..101715d9030 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -268,22 +268,12 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
         exec java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Dkura.os.version=${kura.os.version} \
         -Dkura.arch=${kura.arch} \
@@ -321,16 +311,6 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
         exec java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/var/log/kura-gc.log \
@@ -338,7 +318,7 @@ if [ -z "$KURA_RUNNING" ] ; then
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=*:8000,suspend=n \
         -Dkura.os.version=${kura.os.version} \
@@ -378,22 +358,12 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
   nohup java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Dkura.os.version=${kura.os.version} \
         -Dkura.arch=${kura.arch} \
@@ -424,24 +394,12 @@ fi]]>
         <!-- Populate parameters -->
         <copy file="src/main/resources/${build.name}/kura_install.sh"
             tofile="${project.build.directory}/${build.output.name}/kura_install.sh" />
-        <copy file="src/main/resources/common/kura.init.yocto"
-            tofile="${project.build.directory}/${build.output.name}/kura.init.yocto"
-            failonerror="false" />
-        <copy file="src/main/resources/common/kura.init.raspbian"
-            tofile="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-            failonerror="false" />
         <copy file="src/main/resources/common/kura.service"
             tofile="${project.build.directory}/${build.output.name}/kura.service"
             failonerror="false" />
         <replaceregexp
             file="${project.build.directory}/${build.output.name}/kura_install.sh"
             match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-        <replaceregexp
-            file="${project.build.directory}/${build.output.name}/kura.init.yocto"
-            match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-        <replaceregexp
-            file="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-            match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
         <replaceregexp
             file="${project.build.directory}/${build.output.name}/kura.service"
             match="INSTALL_DIR" replace="${kura.install.dir}" />
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control
similarity index 71%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control
rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/control
index cf60b26aabf..841c492979f 100644
--- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control
@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: arm64
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/postinst b/kura/distrib/src/main/resources/aarch64-nn/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/postinst
rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst b/kura/distrib/src/main/resources/aarch64-nn/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst
rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm b/kura/distrib/src/main/resources/aarch64-nn/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm
rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate b/kura/distrib/src/main/resources/aarch64-nn/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate
rename to kura/distrib/src/main/resources/aarch64-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties b/kura/distrib/src/main/resources/aarch64-nn/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties
rename to kura/distrib/src/main/resources/aarch64-nn/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh b/kura/distrib/src/main/resources/aarch64-nn/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh
rename to kura/distrib/src/main/resources/aarch64-nn/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/aarch64-nn/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh
rename to kura/distrib/src/main/resources/aarch64-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml b/kura/distrib/src/main/resources/aarch64-nn/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml
rename to kura/distrib/src/main/resources/aarch64-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/aarch64/deb/control/control
similarity index 75%
rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/control
rename to kura/distrib/src/main/resources/aarch64/deb/control/control
index 9eaa1b0d38b..adb2db42e77 100644
--- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control
+++ b/kura/distrib/src/main/resources/aarch64/deb/control/control
@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: arm64
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/postinst b/kura/distrib/src/main/resources/aarch64/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/postinst
rename to kura/distrib/src/main/resources/aarch64/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst b/kura/distrib/src/main/resources/aarch64/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst
rename to kura/distrib/src/main/resources/aarch64/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm b/kura/distrib/src/main/resources/aarch64/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm
rename to kura/distrib/src/main/resources/aarch64/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.init b/kura/distrib/src/main/resources/aarch64/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/firewall.init
rename to kura/distrib/src/main/resources/aarch64/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.service b/kura/distrib/src/main/resources/aarch64/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/firewall.service
rename to kura/distrib/src/main/resources/aarch64/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.logrotate b/kura/distrib/src/main/resources/aarch64/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/kura.logrotate
rename to kura/distrib/src/main/resources/aarch64/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.properties b/kura/distrib/src/main/resources/aarch64/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/kura.properties
rename to kura/distrib/src/main/resources/aarch64/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_install.sh b/kura/distrib/src/main/resources/aarch64/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/kura_install.sh
rename to kura/distrib/src/main/resources/aarch64/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh b/kura/distrib/src/main/resources/aarch64/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh
rename to kura/distrib/src/main/resources/aarch64/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64/log4j.xml b/kura/distrib/src/main/resources/aarch64/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/log4j.xml
rename to kura/distrib/src/main/resources/aarch64/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control
similarity index 71%
rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control
rename to kura/distrib/src/main/resources/armhf-nn/deb/control/control
index ecf8416ba32..2fdbc663318 100644
--- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/armhf-nn/deb/control/control
@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: armhf
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst b/kura/distrib/src/main/resources/armhf-nn/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst
rename to kura/distrib/src/main/resources/armhf-nn/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst b/kura/distrib/src/main/resources/armhf-nn/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst
rename to kura/distrib/src/main/resources/armhf-nn/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm b/kura/distrib/src/main/resources/armhf-nn/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm
rename to kura/distrib/src/main/resources/armhf-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate b/kura/distrib/src/main/resources/armhf-nn/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate
rename to kura/distrib/src/main/resources/armhf-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties b/kura/distrib/src/main/resources/armhf-nn/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.properties
rename to kura/distrib/src/main/resources/armhf-nn/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh b/kura/distrib/src/main/resources/armhf-nn/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh
rename to kura/distrib/src/main/resources/armhf-nn/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/armhf-nn/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/kura_upgrade.sh
rename to kura/distrib/src/main/resources/armhf-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml b/kura/distrib/src/main/resources/armhf-nn/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml
rename to kura/distrib/src/main/resources/armhf-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/armhf/deb/control/control
similarity index 75%
rename from kura/distrib/src/main/resources/generic-arm32/deb/control/control
rename to kura/distrib/src/main/resources/armhf/deb/control/control
index 74cf93815b0..fa74d63575d 100644
--- a/kura/distrib/src/main/resources/generic-arm32/deb/control/control
+++ b/kura/distrib/src/main/resources/armhf/deb/control/control
@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: armhf
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/postinst b/kura/distrib/src/main/resources/armhf/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/deb/control/postinst
rename to kura/distrib/src/main/resources/armhf/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst b/kura/distrib/src/main/resources/armhf/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/deb/control/preinst
rename to kura/distrib/src/main/resources/armhf/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm b/kura/distrib/src/main/resources/armhf/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/deb/control/prerm
rename to kura/distrib/src/main/resources/armhf/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.init b/kura/distrib/src/main/resources/armhf/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/firewall.init
rename to kura/distrib/src/main/resources/armhf/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.service b/kura/distrib/src/main/resources/armhf/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/firewall.service
rename to kura/distrib/src/main/resources/armhf/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.logrotate b/kura/distrib/src/main/resources/armhf/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/kura.logrotate
rename to kura/distrib/src/main/resources/armhf/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.properties b/kura/distrib/src/main/resources/armhf/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/kura.properties
rename to kura/distrib/src/main/resources/armhf/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_install.sh b/kura/distrib/src/main/resources/armhf/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/kura_install.sh
rename to kura/distrib/src/main/resources/armhf/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh b/kura/distrib/src/main/resources/armhf/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh
rename to kura/distrib/src/main/resources/armhf/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32/log4j.xml b/kura/distrib/src/main/resources/armhf/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/log4j.xml
rename to kura/distrib/src/main/resources/armhf/log4j.xml
diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control
index 17ac6fcdafc..904c79497f4 100644
--- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control
@@ -1,15 +1,29 @@
-Package: kura
+#
+# Copyright (c) 2024 Eurotech and/or its affiliates and others
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#  Eurotech
+#
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
+Section: admin
+Priority: optional
 Depends: dos2unix, unzip, 
  telnet, bluez-hcidump, 
  bluez, chrony, ntpdate, 
- openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+ openjdk-17-jre-headless | temurin-17-jdk,
  cron
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control
similarity index 71%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control
rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/control
index cf60b26aabf..23952627e9a 100644
--- a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control
@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/postinst b/kura/distrib/src/main/resources/x86_64-nn/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/postinst
rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/preinst b/kura/distrib/src/main/resources/x86_64-nn/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/preinst
rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/prerm b/kura/distrib/src/main/resources/x86_64-nn/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/prerm
rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate b/kura/distrib/src/main/resources/x86_64-nn/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate
rename to kura/distrib/src/main/resources/x86_64-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties b/kura/distrib/src/main/resources/x86_64-nn/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties
rename to kura/distrib/src/main/resources/x86_64-nn/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh b/kura/distrib/src/main/resources/x86_64-nn/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh
rename to kura/distrib/src/main/resources/x86_64-nn/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/x86_64-nn/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura_upgrade.sh
rename to kura/distrib/src/main/resources/x86_64-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml b/kura/distrib/src/main/resources/x86_64-nn/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml
rename to kura/distrib/src/main/resources/x86_64-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/x86_64/deb/control/control
similarity index 75%
rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/control
rename to kura/distrib/src/main/resources/x86_64/deb/control/control
index 9eaa1b0d38b..1d63e3c53ea 100644
--- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control
+++ b/kura/distrib/src/main/resources/x86_64/deb/control/control
@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <kura-dev@eclipse.org>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst b/kura/distrib/src/main/resources/x86_64/deb/control/postinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst
rename to kura/distrib/src/main/resources/x86_64/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst b/kura/distrib/src/main/resources/x86_64/deb/control/preinst
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst
rename to kura/distrib/src/main/resources/x86_64/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm b/kura/distrib/src/main/resources/x86_64/deb/control/prerm
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm
rename to kura/distrib/src/main/resources/x86_64/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.init b/kura/distrib/src/main/resources/x86_64/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/firewall.init
rename to kura/distrib/src/main/resources/x86_64/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.service b/kura/distrib/src/main/resources/x86_64/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/firewall.service
rename to kura/distrib/src/main/resources/x86_64/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.logrotate b/kura/distrib/src/main/resources/x86_64/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/kura.logrotate
rename to kura/distrib/src/main/resources/x86_64/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.properties b/kura/distrib/src/main/resources/x86_64/kura.properties
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/kura.properties
rename to kura/distrib/src/main/resources/x86_64/kura.properties
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_install.sh b/kura/distrib/src/main/resources/x86_64/kura_install.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/kura_install.sh
rename to kura/distrib/src/main/resources/x86_64/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh b/kura/distrib/src/main/resources/x86_64/kura_upgrade.sh
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh
rename to kura/distrib/src/main/resources/x86_64/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64/log4j.xml b/kura/distrib/src/main/resources/x86_64/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/log4j.xml
rename to kura/distrib/src/main/resources/x86_64/log4j.xml