diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
index e73de846885..73b4f24d69b 100644
--- a/kura/distrib/pom.xml
+++ b/kura/distrib/pom.xml
@@ -1147,7 +1147,7 @@
             </properties>
         </profile>
         <profile>
-            <id>generic-arm32</id>
+            <id>generic-armhf</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1180,7 +1180,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-jars</id>
+                                <id>generic-armhf-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1191,8 +1191,8 @@
                                         <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="generic-armhf" />
+                                        <property name="target.device" value="generic-armhf" />
                                         <property name="native.tag" value="armv6hf" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="armv7_hf" />
@@ -1211,18 +1211,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-deb</id>
+                                <id>generic-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}_generic-armhf_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-armhf/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-arm32.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-armhf.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1244,7 +1244,7 @@
         </profile>
 
         <profile>
-            <id>generic-arm32-nn</id>
+            <id>generic-armhf-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1277,7 +1277,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-nn-jars</id>
+                                <id>generic-armhf-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1288,8 +1288,8 @@
                                         <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="generic-armhf-nn" />
+                                        <property name="target.device" value="generic-armhf-nn" />
                                         <property name="native.tag" value="armv6hf" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="armv7_hf" />
@@ -1308,18 +1308,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-arm32-nn-deb</id>
+                                <id>generic-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_${project.version}_generic-armhf-nn_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-armhf-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-arm32-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-armhf-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1336,7 +1336,7 @@
         </profile>
 
         <profile>
-            <id>generic-x86_64</id>
+            <id>generic-amd64</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1369,7 +1369,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-jars</id>
+                                <id>generic-amd64-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1380,8 +1380,8 @@
                                         <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="generic-amd64" />
+                                        <property name="target.device" value="generic-amd64" />
                                         <property name="native.tag" value="x86_64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="x86_64" />
@@ -1400,18 +1400,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-deb</id>
+                                <id>generic-amd64-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}_generic-amd64_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-amd64/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-x86_64.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-amd64.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1433,7 +1433,7 @@
         </profile>
 
 		<profile>
-            <id>generic-x86_64-nn</id>
+            <id>generic-amd64-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1466,7 +1466,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-nn-jars</id>
+                                <id>generic-amd64-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1477,8 +1477,8 @@
                                         <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="generic-amd64-nn" />
+                                        <property name="target.device" value="generic-amd64-nn" />
                                         <property name="native.tag" value="x86_64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="x86_64" />
@@ -1497,18 +1497,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-x86_64-nn-deb</id>
+                                <id>generic-amd64-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_${project.version}_generic-amd64-nn_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-amd64-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-x86_64-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-amd64-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1525,7 +1525,7 @@
         </profile>
         
         <profile>
-            <id>generic-aarch64</id>
+            <id>generic-arm64</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1558,7 +1558,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-jars</id>
+                                <id>generic-arm64-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1569,8 +1569,8 @@
                                         <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="generic-arm64" />
+                                        <property name="target.device" value="generic-arm64" />
                                         <property name="native.tag" value="aarch64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="generic-arm64" />
@@ -1589,18 +1589,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-deb</id>
+                                <id>generic-arm64-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}_generic-arm64_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-arm64/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-aarch64.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-arm64.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
@@ -1622,7 +1622,7 @@
         </profile>
 
 		<profile>
-            <id>generic-aarch64-nn</id>
+            <id>generic-arm64-nn</id>
             <activation>
                 <property>
                     <name>buildAll</name>
@@ -1655,7 +1655,7 @@
                         <version>1.7</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-nn-jars</id>
+                                <id>generic-arm64-nn-jars</id>
                                 <phase>prepare-package</phase>
                                 <goals>
                                     <goal>run</goal>
@@ -1666,8 +1666,8 @@
                                         <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="generic-arm64-nn" />
+                                        <property name="target.device" value="generic-arm64-nn" />
                                         <property name="native.tag" value="aarch64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="generic-arm64" />
@@ -1686,18 +1686,18 @@
                         <version>1.0</version>
                         <executions>
                             <execution>
-                                <id>generic-aarch64-nn-deb</id>
+                                <id>generic-arm64-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_${project.version}_generic-arm64-nn_installer.deb</deb>
+                                    <controlDir>${basedir}/src/main/resources/generic-arm64-nn/deb/control</controlDir>
                                     <dataSet>
                                         <data>
-                                            <src>${basedir}/target/kura_${project.version}_generic-aarch64-nn.zip</src>
+                                            <src>${basedir}/target/kura_${project.version}_generic-arm64-nn.zip</src>
                                             <type>file</type>
                                             <mapper>
                                                 <type>perm</type>
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..6953cb6549f 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
@@ -2,14 +2,15 @@ Package: kura
 Version: [[project.version]]
 Section: misc
 Priority: low
-Depends: dos2unix, unzip, 
- telnet, bluez-hcidump, 
- bluez, chrony, ntpdate, 
+Depends: dos2unix, unzip,
+ telnet, bluez-hcidump,
+ bluez, chrony, ntpdate,
  openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
  cron
-Architecture: all
+Architecture: amd64
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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/control b/kura/distrib/src/main/resources/generic-amd64-nn/deb/control/control
similarity index 87%
rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control
rename to kura/distrib/src/main/resources/generic-amd64-nn/deb/control/control
index 1916034356d..650c0ba2553 100644
--- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-amd64-nn/deb/control/control
@@ -20,9 +20,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd
 Recommends: python3
-Architecture: all
+Architecture: amd64
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties b/kura/distrib/src/main/resources/generic-amd64-nn/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties
rename to kura/distrib/src/main/resources/generic-amd64-nn/kura.properties
index 248b30f37de..d8ba8f835eb 100644
--- a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties
+++ b/kura/distrib/src/main/resources/generic-amd64-nn/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-x86_64
+kura.project=generic-amd64
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=device_name
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-amd64/deb/control/control
similarity index 89%
rename from kura/distrib/src/main/resources/generic-arm32/deb/control/control
rename to kura/distrib/src/main/resources/generic-amd64/deb/control/control
index a55507d887e..3d1b613f176 100644
--- a/kura/distrib/src/main/resources/generic-arm32/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-amd64/deb/control/control
@@ -23,9 +23,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  logrotate,
  gpsd
 Recommends: python3
-Architecture: all
+Architecture: amd64
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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/generic-amd64/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/generic-amd64/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.init b/kura/distrib/src/main/resources/generic-amd64/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/firewall.init
rename to kura/distrib/src/main/resources/generic-amd64/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.service b/kura/distrib/src/main/resources/generic-amd64/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/firewall.service
rename to kura/distrib/src/main/resources/generic-amd64/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.logrotate b/kura/distrib/src/main/resources/generic-amd64/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/kura.logrotate
rename to kura/distrib/src/main/resources/generic-amd64/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.properties b/kura/distrib/src/main/resources/generic-amd64/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-arm32/kura.properties
rename to kura/distrib/src/main/resources/generic-amd64/kura.properties
index 4d821f45f16..f56c054f7d9 100644
--- a/kura/distrib/src/main/resources/generic-arm32/kura.properties
+++ b/kura/distrib/src/main/resources/generic-amd64/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-arm32
+kura.project=generic-amd64
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=device_name
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_install.sh b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64/log4j.xml b/kura/distrib/src/main/resources/generic-amd64/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-aarch64/log4j.xml
rename to kura/distrib/src/main/resources/generic-amd64/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-arm64-nn/deb/control/control
similarity index 86%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control
rename to kura/distrib/src/main/resources/generic-arm64-nn/deb/control/control
index de80d3e16d2..f305647527d 100644
--- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-arm64-nn/deb/control/control
@@ -20,10 +20,11 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd
 Recommends: python3
-Architecture: all
+Architecture: arm64
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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
-  to another.
\ No newline at end of file
+  to another.
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/postinst b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties b/kura/distrib/src/main/resources/generic-arm64-nn/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties
rename to kura/distrib/src/main/resources/generic-arm64-nn/kura.properties
index 6afc9a353cf..8f5d13e93d9 100644
--- a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties
+++ b/kura/distrib/src/main/resources/generic-arm64-nn/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-aarch64
+kura.project=generic-arm64
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=N/A
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-arm64/deb/control/control
similarity index 88%
rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/control
rename to kura/distrib/src/main/resources/generic-arm64/deb/control/control
index 9efbdb6b1f7..9f65d23e0db 100644
--- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-arm64/deb/control/control
@@ -23,10 +23,11 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  logrotate,
  gpsd
 Recommends: python3
-Architecture: all
+Architecture: arm64
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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
-  to another.
\ No newline at end of file
+  to another.
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.init b/kura/distrib/src/main/resources/generic-arm64/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/firewall.init
rename to kura/distrib/src/main/resources/generic-arm64/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.service b/kura/distrib/src/main/resources/generic-arm64/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/firewall.service
rename to kura/distrib/src/main/resources/generic-arm64/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.logrotate b/kura/distrib/src/main/resources/generic-arm64/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/kura.logrotate
rename to kura/distrib/src/main/resources/generic-arm64/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.properties b/kura/distrib/src/main/resources/generic-arm64/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-aarch64/kura.properties
rename to kura/distrib/src/main/resources/generic-arm64/kura.properties
index 00204a9dcaa..78de7a8b271 100644
--- a/kura/distrib/src/main/resources/generic-aarch64/kura.properties
+++ b/kura/distrib/src/main/resources/generic-arm64/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-aarch64
+kura.project=generic-arm64
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=N/A
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_install.sh b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-arm32/log4j.xml b/kura/distrib/src/main/resources/generic-arm64/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-arm32/log4j.xml
rename to kura/distrib/src/main/resources/generic-arm64/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-armhf-nn/deb/control/control
similarity index 86%
rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control
rename to kura/distrib/src/main/resources/generic-armhf-nn/deb/control/control
index de80d3e16d2..bc9f9be17fd 100644
--- a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-armhf-nn/deb/control/control
@@ -20,10 +20,11 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd
 Recommends: python3
-Architecture: all
+Architecture: armhf
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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
-  to another.
\ No newline at end of file
+  to another.
diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/postinst b/kura/distrib/src/main/resources/generic-armhf-nn/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/generic-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/generic-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/generic-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/generic-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/generic-armhf-nn/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-armhf-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/generic-armhf-nn/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties b/kura/distrib/src/main/resources/generic-armhf-nn/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.properties
rename to kura/distrib/src/main/resources/generic-armhf-nn/kura.properties
index 1f856020d33..9a1539c657a 100644
--- a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties
+++ b/kura/distrib/src/main/resources/generic-armhf-nn/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-arm32
+kura.project=generic-armhf
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=device_name
diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-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/generic-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/generic-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/generic-armhf-nn/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml b/kura/distrib/src/main/resources/generic-armhf-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/generic-armhf-nn/log4j.xml
diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-armhf/deb/control/control
similarity index 88%
rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/control
rename to kura/distrib/src/main/resources/generic-armhf/deb/control/control
index 9efbdb6b1f7..0b52604e314 100644
--- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control
+++ b/kura/distrib/src/main/resources/generic-armhf/deb/control/control
@@ -23,10 +23,11 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem
  logrotate,
  gpsd
 Recommends: python3
-Architecture: all
+Architecture: armhf
 Maintainer: support@eurotech.com
-Description: Kura is an inclusive software framework that puts a layer
+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
-  to another.
\ No newline at end of file
+  to another.
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/postinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/preinst
diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/prerm
diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.init b/kura/distrib/src/main/resources/generic-armhf/firewall.init
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/firewall.init
rename to kura/distrib/src/main/resources/generic-armhf/firewall.init
diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.service b/kura/distrib/src/main/resources/generic-armhf/firewall.service
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/firewall.service
rename to kura/distrib/src/main/resources/generic-armhf/firewall.service
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.logrotate b/kura/distrib/src/main/resources/generic-armhf/kura.logrotate
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/kura.logrotate
rename to kura/distrib/src/main/resources/generic-armhf/kura.logrotate
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.properties b/kura/distrib/src/main/resources/generic-armhf/kura.properties
similarity index 99%
rename from kura/distrib/src/main/resources/generic-x86_64/kura.properties
rename to kura/distrib/src/main/resources/generic-armhf/kura.properties
index eab684412d0..ffbda80b119 100644
--- a/kura/distrib/src/main/resources/generic-x86_64/kura.properties
+++ b/kura/distrib/src/main/resources/generic-armhf/kura.properties
@@ -18,7 +18,7 @@ kura.name=Eclipse Kura
 kura.version=
 kura.marketplace.compatibility.version=
 kura.company=EUROTECH
-kura.project=generic-x86_64
+kura.project=generic-armhf
 kura.platform=kura_platform
 kura.device.name=device_name
 kura.model.id=device_name
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_install.sh b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/kura_install.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/kura_upgrade.sh
diff --git a/kura/distrib/src/main/resources/generic-x86_64/log4j.xml b/kura/distrib/src/main/resources/generic-armhf/log4j.xml
similarity index 100%
rename from kura/distrib/src/main/resources/generic-x86_64/log4j.xml
rename to kura/distrib/src/main/resources/generic-armhf/log4j.xml