diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
index 4e497933ae4..c80fe91f8a9 100644
--- a/kura/distrib/pom.xml
+++ b/kura/distrib/pom.xml
@@ -935,22 +935,22 @@
                                 </exec>
                                 <move file="RELEASE_INFO/${project.version}/p2-repo-common/pom_.xml" tofile="RELEASE_INFO/${project.version}/p2-repo-common/pom.xml" />
 
-                                <!-- Copy target-platform/p2-repo-equinox_3.16.0/pom.xml in distrib/RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom.xml -->
-                                <copy file="${kura.basedir}/../../target-platform/p2-repo-equinox_3.16.0/pom.xml" tofile="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom.xml" overwrite="true" />
+                                <!-- Copy target-platform/p2-repo-equinoxpom.xml in distrib/RELEASE_INFO/${project.version}/p2-repo-equinox/pom.xml -->
+                                <copy file="${kura.basedir}/../../target-platform/p2-repo-equinoxpom.xml" tofile="RELEASE_INFO/${project.version}/p2-repo-equinox/pom.xml" overwrite="true" />
                                 <!-- replace artifactId -->
-                                <replace token="&lt;artifactId&gt;target-platform&lt;/artifactId&gt;" value="&lt;artifactId&gt;target-platform-previous&lt;/artifactId&gt;" dir="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0">
+                                <replace token="&lt;artifactId&gt;target-platform&lt;/artifactId&gt;" value="&lt;artifactId&gt;target-platform-previous&lt;/artifactId&gt;" dir="RELEASE_INFO/${project.version}/p2-repo-equinox">
                                     <include name="pom.xml" />
                                 </replace>
                                 <!-- Add strip version -->
-                                <replace token="&lt;/artifactItems&gt;" value="&lt;/artifactItems&gt;&lt;stripVersion&gt;true&lt;/stripVersion&gt;" dir="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0">
+                                <replace token="&lt;/artifactItems&gt;" value="&lt;/artifactItems&gt;&lt;stripVersion&gt;true&lt;/stripVersion&gt;" dir="RELEASE_INFO/${project.version}/p2-repo-equinox">
                                     <include name="pom.xml" />
                                 </replace>
                                 <!-- execute script to add artifacts to pom file - need to have different input/output files (Win) -->
-                                <exec executable="bash" output="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom_.xml">
+                                <exec executable="bash" output="RELEASE_INFO/${project.version}/p2-repo-equinox/pom_.xml">
                                     <arg value="src/main/sh/generate_p2_repo_pom.sh" />
-                                    <arg value="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom.xml" />
+                                    <arg value="RELEASE_INFO/${project.version}/p2-repo-equinox/pom.xml" />
                                 </exec>
-                                <move file="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom_.xml" tofile="RELEASE_INFO/${project.version}/p2-repo-equinox_3.16.0/pom.xml" />
+                                <move file="RELEASE_INFO/${project.version}/p2-repo-equinox/pom_.xml" tofile="RELEASE_INFO/${project.version}/p2-repo-equinox/pom.xml" />
                             </target>
                         </configuration>
                     </execution>
@@ -1967,9 +1967,9 @@
                         </executions>
                         <configuration>
                             <compress>false</compress>
-                            <sourceLocation>${project.build.directory}/staging/target-definition/equinox_3.16.0/repository</sourceLocation>
-                            <artifactRepositoryLocation>${project.build.directory}/staging/target-definition/equinox_3.16.0/repository</artifactRepositoryLocation>
-                            <metadataRepositoryLocation>${project.build.directory}/staging/target-definition/equinox_3.16.0/repository</metadataRepositoryLocation>
+                            <sourceLocation>${project.build.directory}/staging/target-definition/equinox/repository</sourceLocation>
+                            <artifactRepositoryLocation>${project.build.directory}/staging/target-definition/equinox/repository</artifactRepositoryLocation>
+                            <metadataRepositoryLocation>${project.build.directory}/staging/target-definition/equinox/repository</metadataRepositoryLocation>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -1997,98 +1997,98 @@
                                             <fileset dir="../target-definition" />
                                         </copy>
                                         <!-- Add individual emulator bundles-->
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.clock_${org.eclipse.kura.emulator.clock.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.gpio_${org.eclipse.kura.emulator.gpio.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.net_${org.eclipse.kura.emulator.net.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.position_${org.eclipse.kura.emulator.position.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.usb_${org.eclipse.kura.emulator.usb.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.watchdog_${org.eclipse.kura.emulator.watchdog.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.clock_${org.eclipse.kura.emulator.clock.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.gpio_${org.eclipse.kura.emulator.gpio.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.net_${org.eclipse.kura.emulator.net.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.position_${org.eclipse.kura.emulator.position.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.usb_${org.eclipse.kura.emulator.usb.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.emulator.watchdog_${org.eclipse.kura.emulator.watchdog.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
 
                                         <delete file="${project.build.directory}/staging/target-definition/pom.xml" />
                                         <delete dir="${project.build.directory}/staging/target-definition/common/source" />
-                                        <delete file="${project.build.directory}/staging/target-definition/kura-equinox_3.16.0.target" />
-                                        <delete dir="${project.build.directory}/staging/target-definition/equinox_3.16.0/source" />
-                                        <delete file="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/artifacts.xml" />
-                                        <delete file="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/content.xml" />
+                                        <delete file="${project.build.directory}/staging/target-definition/kura-equinox.target" />
+                                        <delete dir="${project.build.directory}/staging/target-definition/equinox/source" />
+                                        <delete file="${project.build.directory}/staging/target-definition/equinox/repository/artifacts.xml" />
+                                        <delete file="${project.build.directory}/staging/target-definition/equinox/repository/content.xml" />
                                         <delete dir="${project.build.directory}/staging/target-definition/target" />
 
                                         <copy overwrite="true" file="src/main/resources/common/projects/target_definition.project" tofile="${project.build.directory}/staging/target-definition/.project" />
-                                        <copy file="src/main/resources/common/kura-equinox_3.16.0.target" todir="${project.build.directory}/staging/target-definition" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.api_${org.eclipse.kura.api.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel_${org.eclipse.kura.camel.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.cloud.factory_${org.eclipse.kura.camel.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.xml_${org.eclipse.kura.camel.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloud.base.provider_${org.eclipse.kura.cloud.base.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.configuration_${org.eclipse.kura.core.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.crypto_${org.eclipse.kura.core.crypto.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.deployment_${org.eclipse.kura.core.deployment.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.keystore_${org.eclipse.kura.core.keystore.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.http.server.manager_${org.eclipse.kura.http.server.manager.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.identity_${org.eclipse.kura.core.identity.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.inventory_${org.eclipse.kura.core.inventory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.net_${org.eclipse.kura.core.net.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.system_${org.eclipse.kura.core.system.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.deployment.agent_${org.eclipse.kura.deployment.agent.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.status_${org.eclipse.kura.core.status.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.ibeacon.provider_${org.eclipse.kura.ble.ibeacon.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.eddystone.provider_${org.eclipse.kura.ble.eddystone.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.provider_${org.eclipse.kura.asset.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.cloudlet.provider_${org.eclipse.kura.asset.cloudlet.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.helper.provider_${org.eclipse.kura.asset.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.driver.helper.provider_${org.eclipse.kura.driver.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.localization_${org.eclipse.kura.localization.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.localization.resources_${org.eclipse.kura.localization.resources.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.net.configuration_${org.eclipse.kura.net.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.util_${org.eclipse.kura.util.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.camel_${org.eclipse.kura.wire.camel.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.provider_${org.eclipse.kura.wire.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.h2db.component.provider_${org.eclipse.kura.wire.h2db.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.db.component.provider_${org.eclipse.kura.wire.db.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.helper.provider_${org.eclipse.kura.wire.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.provider_${org.eclipse.kura.wire.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.web2_${org.eclipse.kura.web2.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" failonerror="false" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.useradmin.store_${org.eclipse.kura.useradmin.store.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="src/main/resources/common/kura-equinox.target" todir="${project.build.directory}/staging/target-definition" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.api_${org.eclipse.kura.api.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel_${org.eclipse.kura.camel.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.cloud.factory_${org.eclipse.kura.camel.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.camel.xml_${org.eclipse.kura.camel.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core_${org.eclipse.kura.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.certificates_${org.eclipse.kura.core.certificates.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloud.base.provider_${org.eclipse.kura.cloud.base.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.command_${org.eclipse.kura.core.cloud.command.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.cloud.factory_${org.eclipse.kura.core.cloud.factory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.comm_${org.eclipse.kura.core.comm.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.configuration_${org.eclipse.kura.core.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.crypto_${org.eclipse.kura.core.crypto.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.deployment_${org.eclipse.kura.core.deployment.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.keystore_${org.eclipse.kura.core.keystore.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.http.server.manager_${org.eclipse.kura.http.server.manager.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.identity_${org.eclipse.kura.core.identity.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.inventory_${org.eclipse.kura.core.inventory.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.net_${org.eclipse.kura.core.net.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.system_${org.eclipse.kura.core.system.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.deployment.agent_${org.eclipse.kura.deployment.agent.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.core.status_${org.eclipse.kura.core.status.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.ibeacon.provider_${org.eclipse.kura.ble.ibeacon.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ble.eddystone.provider_${org.eclipse.kura.ble.eddystone.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.provider_${org.eclipse.kura.asset.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.cloudlet.provider_${org.eclipse.kura.asset.cloudlet.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.asset.helper.provider_${org.eclipse.kura.asset.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.driver.helper.provider_${org.eclipse.kura.driver.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.localization_${org.eclipse.kura.localization.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.localization.resources_${org.eclipse.kura.localization.resources.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.net.configuration_${org.eclipse.kura.net.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.util_${org.eclipse.kura.util.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.camel_${org.eclipse.kura.wire.camel.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.provider_${org.eclipse.kura.wire.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.h2db.component.provider_${org.eclipse.kura.wire.h2db.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.db.component.provider_${org.eclipse.kura.wire.db.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.helper.provider_${org.eclipse.kura.wire.helper.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.provider_${org.eclipse.kura.wire.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.web2_${org.eclipse.kura.web2.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" failonerror="false" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.useradmin.store_${org.eclipse.kura.useradmin.store.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
                                         <!-- Add REST bundles-->
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.request.handler.jaxrs_${org.eclipse.kura.request.handler.jaxrs.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.provider_${org.eclipse.kura.rest.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.cloudconnection.provider_${org.eclipse.kura.rest.cloudconnection.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.configuration.provider_${org.eclipse.kura.rest.configuration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.network.configuration.provider_${org.eclipse.kura.rest.network.configuration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.inventory.provider_${org.eclipse.kura.rest.inventory.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.command.provider_${org.eclipse.kura.rest.command.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.packages.provider_${org.eclipse.kura.rest.packages.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.position.provider_${org.eclipse.kura.rest.position.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.identity.provider_${org.eclipse.kura.rest.identity.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.security.provider_${org.eclipse.kura.rest.security.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.service.listing.provider_${org.eclipse.kura.rest.service.listing.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.system.provider_${org.eclipse.kura.rest.system.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.asset.provider_${org.eclipse.kura.rest.asset.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.keystore.provider_${org.eclipse.kura.rest.keystore.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.request.handler.jaxrs_${org.eclipse.kura.request.handler.jaxrs.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.provider_${org.eclipse.kura.rest.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.cloudconnection.provider_${org.eclipse.kura.rest.cloudconnection.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.configuration.provider_${org.eclipse.kura.rest.configuration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.network.configuration.provider_${org.eclipse.kura.rest.network.configuration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.inventory.provider_${org.eclipse.kura.rest.inventory.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.command.provider_${org.eclipse.kura.rest.command.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.packages.provider_${org.eclipse.kura.rest.packages.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.position.provider_${org.eclipse.kura.rest.position.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.identity.provider_${org.eclipse.kura.rest.identity.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.security.provider_${org.eclipse.kura.rest.security.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.service.listing.provider_${org.eclipse.kura.rest.service.listing.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.system.provider_${org.eclipse.kura.rest.system.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.asset.provider_${org.eclipse.kura.rest.asset.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.keystore.provider_${org.eclipse.kura.rest.keystore.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
                                         <!-- Add Artemis bundles-->
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.core_${org.eclipse.kura.broker.artemis.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.simple.mqtt_${org.eclipse.kura.broker.artemis.simple.mqtt.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.xml_${org.eclipse.kura.broker.artemis.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.join.provider_${org.eclipse.kura.wire.component.join.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.core_${org.eclipse.kura.broker.artemis.core.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.simple.mqtt_${org.eclipse.kura.broker.artemis.simple.mqtt.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.broker.artemis.xml_${org.eclipse.kura.broker.artemis.xml.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.component.join.provider_${org.eclipse.kura.wire.component.join.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
 
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.json.marshaller.unmarshaller.provider_${org.eclipse.kura.json.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.json.marshaller.unmarshaller.provider_${org.eclipse.kura.json.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.xml.marshaller.unmarshaller.provider_${org.eclipse.kura.xml.marshaller.unmarshaller.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
 
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-										<copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ai.triton.server_${org.eclipse.kura.ai.triton.server.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.container.orchestration.provider_${org.eclipse.kura.container.orchestration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.container.provider_${org.eclipse.kura.container.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.configuration.change.manager_${org.eclipse.kura.configuration.change.manager.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.event.publisher_${org.eclipse.kura.event.publisher.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
-                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider_${org.eclipse.kura.cloudconnection.eclipseiot.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+										<copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.kapua.mqtt.provider_${org.eclipse.kura.cloudconnection.kapua.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.cloudconnection.raw.mqtt.provider_${org.eclipse.kura.cloudconnection.raw.mqtt.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.ai.triton.server_${org.eclipse.kura.ai.triton.server.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.container.orchestration.provider_${org.eclipse.kura.container.orchestration.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.container.provider_${org.eclipse.kura.container.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.configuration.change.manager_${org.eclipse.kura.configuration.change.manager.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.event.publisher_${org.eclipse.kura.event.publisher.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
+                                        <copy file="${project.build.directory}/plugins/org.eclipse.kura.db.h2db.provider_${org.eclipse.kura.db.h2db.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox/repository/plugins" />
                                     </target>
                                 </configuration>
                             </execution>
diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 6cddff1fa98..332175eb043 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -127,7 +127,7 @@
 
 
         <condition property="kura.osgi.repo"
-            value="../../target-platform/p2-repo-equinox_3.16.0/target/source">
+            value="../../target-platform/p2-repo-equinox/target/source">
             <or>
                 <not>
                     <isset property="kura.osgi" />
@@ -144,7 +144,7 @@
 
         <copy file="src/main/resources/${build.name}/snapshot_0.xml"
             tofile="${project.build.directory}/${build.output.name}/snapshot_0.xml" failonerror="false" />
-        <copy file="src/main/osgi/equinox_3.16.0/configuration/config.ini"
+        <copy file="src/main/osgi/equinox/configuration/config.ini"
             tofile="${project.build.directory}/${build.output.name}/config.ini" />
 
         <!-- Copy jdk.dio files -->
@@ -649,54 +649,162 @@ fi]]>
             <param name="start.level" value="6" />
             <param name="start" value="" />
         </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.cm_${org.osgi.service.cm.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.component_${org.osgi.service.component.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.coordinator_${org.osgi.service.coordinator.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.device_${org.osgi.service.device.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.event_${org.osgi.service.event.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.log.stream_${org.osgi.service.log.stream.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.metatype_${org.osgi.service.metatype.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.prefs_${org.osgi.service.prefs.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.provisioning_${org.osgi.service.provisioning.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.upnp_${org.osgi.service.upnp.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.useradmin_${org.osgi.service.useradmin.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.service.wireadmin_${org.osgi.service.wireadmin.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.function_${org.osgi.util.function.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.measurement_${org.osgi.util.measurement.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.position_${org.osgi.util.position.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.promise_${org.osgi.util.promise.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.pushstream_${org.osgi.util.pushstream.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.osgi.util.xml_${org.osgi.util.xml.version}.jar"/>
+            <param name="start.level" value="2"/>
+            <param name="start" value=""/>
+            <param name="upgrader" value="true"/>
+        </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.apache.felix.http.jetty_${org.apache.felix.http.jetty.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.apache.felix.http.servlet-api_${org.apache.felix.http.servlet-api.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jersey-media-json-jackson_${org.glassfish.jersey.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jersey-media-multipart_${org.glassfish.jersey.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-jakarta-rs-json-provider_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-jakarta-rs-base_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-annotations_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-module-jakarta-xmlbind-annotations_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-core_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jackson-databind_${com.fasterxml.jackson.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
@@ -706,7 +814,7 @@ fi]]>
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.kura.sun.misc_${org.eclipse.kura.sun.misc.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="" />
         </antcall>
         <antcall target="install-plugin">
@@ -729,11 +837,6 @@ fi]]>
             <param name="start.level" value="1" />
             <param name="start" value="" />
         </antcall>
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.equinox.ds_${org.eclipse.equinox.ds.version}.jar" />
-            <param name="start.level" value="1" />
-            <param name="start" value="s" />
-        </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.equinox.event_${org.eclipse.equinox.event.version}.jar" />
             <param name="start.level" value="1" />
@@ -756,46 +859,51 @@ fi]]>
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.osgi.service.http.whiteboard_${org.osgi.service.http.whiteboard.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.osgi.service.servlet_${org.osgi.service.servlet.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="jakarta.ws.rs-api_${jakarta.ws.rs-api.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.osgi.service.jakartars_${org.osgi.service.jakartars.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.osgitech.rest_${org.eclipse.osgi-technology.rest.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.osgitech.rest.config_${org.eclipse.osgi-technology.rest.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.osgitech.rest.sse_${org.eclipse.osgi-technology.rest.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.osgitech.rest.jetty_${org.eclipse.osgi-technology.rest.version}.jar" />
-            <param name="start.level" value="1" />
+            <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.eclipse.osgitech.rest.servlet.whiteboard_${org.eclipse.osgi-technology.rest.version}.jar" />
+            <param name="start.level" value="5" />
+            <param name="start" value="s" />
+        </antcall>
+        <antcall target="install-plugin">
+            <param name="bundle.file" value="org.apache.felix.scr_${org.apache.felix.scr.version}.jar" />
             <param name="start.level" value="1" />
             <param name="start" value="s" />
         </antcall>
@@ -804,11 +912,6 @@ fi]]>
             <param name="start.level" value="2" />
             <param name="start" value="s" />
         </antcall>
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.apache.felix.scr_${org.apache.felix.scr.version}.jar" />
-            <param name="start.level" value="5" />
-            <param name="start" value="" />
-        </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.apache.felix.gogo.command_${org.apache.felix.gogo.command.version}.jar" />
             <param name="start.level" value="5" />
@@ -895,12 +998,12 @@ fi]]>
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.ee8.jetty-ee8-servlet.version}.jar" />
+            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.version}.jar" />
             <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
         <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.ee8.jetty-ee8-nested.version}.jar" />
+            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.version}.jar" />
             <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
diff --git a/kura/distrib/src/main/osgi/equinox_3.16.0/configuration/config.ini b/kura/distrib/src/main/osgi/equinox/configuration/config.ini
similarity index 85%
rename from kura/distrib/src/main/osgi/equinox_3.16.0/configuration/config.ini
rename to kura/distrib/src/main/osgi/equinox/configuration/config.ini
index cbf90dad87e..3faea8a2de6 100644
--- a/kura/distrib/src/main/osgi/equinox_3.16.0/configuration/config.ini
+++ b/kura/distrib/src/main/osgi/equinox/configuration/config.ini
@@ -1,5 +1,5 @@
 #Configuration File
-osgi.framework=file\:plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar
+osgi.framework=file\:plugins/org.eclipse.osgi_3.21.0.v20240717-2103.jar
 equinox.use.ds=true
 osgi.nl=en_us
 osgi.clean=true
diff --git a/kura/distrib/src/main/osgi/equinox_3.16.0/configwindows/config.ini b/kura/distrib/src/main/osgi/equinox/configwindows/config.ini
similarity index 82%
rename from kura/distrib/src/main/osgi/equinox_3.16.0/configwindows/config.ini
rename to kura/distrib/src/main/osgi/equinox/configwindows/config.ini
index 2b5fc8f545a..29e1d4a61f7 100644
--- a/kura/distrib/src/main/osgi/equinox_3.16.0/configwindows/config.ini
+++ b/kura/distrib/src/main/osgi/equinox/configwindows/config.ini
@@ -1,5 +1,5 @@
 #Configuration File
-osgi.framework=file\:plugins/org.eclipse.osgi_3.16.0.v20200828-0759.jar
+osgi.framework=file\:plugins/org.eclipse.osgi_3.21.0.v20240717-2103.jar
 equinox.use.ds=true
 osgi.nl=en_us
 osgi.clean=true
diff --git a/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile b/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile
index ff8c7cf55e2..d7320167013 100644
--- a/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile
+++ b/kura/distrib/src/main/resources/docker-alpine-x86_64-nn/Dockerfile
@@ -14,7 +14,7 @@ COPY --from=kura_base /kura-install/kura_*_docker-x86_64-nn_installer.sh /kura-i
 
 ENV \
   KURA_DIR=/opt/eclipse/kura \
-  LAUNCHER_VERSION="1.5.800.v20200727-1323" 
+  LAUNCHER_VERSION="1.6.900.v20240613-2009" 
 
 
 
diff --git a/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile b/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile
index 8e6d03941ae..d87397fa716 100644
--- a/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile
+++ b/kura/distrib/src/main/resources/docker-ubi8-x86_64-nn/Dockerfile
@@ -15,7 +15,7 @@ COPY --from=kura_base /kura-install/kura_*_docker-x86_64-nn_installer.sh /kura-i
 ENV \
   KURA_DIR=/opt/eclipse/kura \
   SKIP_JAVA_VERSION_CHECK=true \
-  LAUNCHER_VERSION="1.5.800.v20200727-1323"
+  LAUNCHER_VERSION="1.6.900.v20240613-2009"
 
 RUN true && \
     rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
diff --git a/kura/examples/org.eclipse.kura.example.rest.authentication.provider/META-INF/MANIFEST.MF b/kura/examples/org.eclipse.kura.example.rest.authentication.provider/META-INF/MANIFEST.MF
index 69c92422ca3..f5b2ff32ba1 100644
--- a/kura/examples/org.eclipse.kura.example.rest.authentication.provider/META-INF/MANIFEST.MF
+++ b/kura/examples/org.eclipse.kura.example.rest.authentication.provider/META-INF/MANIFEST.MF
@@ -8,10 +8,9 @@ Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Import-Package: javax.annotation;version="1.2.0",
- javax.servlet.http;version="3.1.0",
- javax.ws.rs.container;version="2.0.1",
- javax.ws.rs.core;version="2.0.1",
+Import-Package: jakarta.annotation;version="2.1.0",
+ jakarta.servlet.http;version="5.0.0",
+ jakarta.ws.rs.container;version="3.1.0",
  org.eclipse.kura.audit;version="[1.0,2.0)",
  org.eclipse.kura.crypto;version="[1.3,2.0)",
  org.eclipse.kura.rest.auth;version="[1.0,1.1)",
diff --git a/kura/examples/pom.xml b/kura/examples/pom.xml
index e8fd40c9df1..9937ee50107 100644
--- a/kura/examples/pom.xml
+++ b/kura/examples/pom.xml
@@ -93,7 +93,6 @@
         <module>org.eclipse.kura.example.wire.math.trig</module>
         <module>org.eclipse.kura.example.driver.sensehat</module>
         <module>org.eclipse.kura.wire.devel.component.provider</module>
-        <module>org.eclipse.kura.example.web.extension</module>
         <module>org.eclipse.kura.example.gpio.led</module>
         <module>org.eclipse.kura.example.tamper.detection</module>
         <module>org.eclipse.kura.example.rest.authentication.provider</module>
@@ -156,9 +155,9 @@
             </activation>
             <repositories>
                 <repository>
-                    <id>p2-repo-equinox_3.16.0</id>
+                    <id>p2-repo-equinox</id>
                     <layout>p2</layout>
-                    <url>file:///${kura.basedir}/target-definition/equinox_3.16.0/repository/</url>
+                    <url>file:///${kura.basedir}/target-definition/equinox/repository/</url>
                 </repository>
             </repositories>
         </profile>
@@ -172,9 +171,9 @@
             </activation>
             <repositories>
                 <repository>
-                    <id>p2-repo-equinox_3.16.0</id>
+                    <id>p2-repo-equinox</id>
                     <layout>p2</layout>
-                    <url>file:///${kura.basedir}/target-definition/equinox_3.16.0/repository/</url>
+                    <url>file:///${kura.basedir}/target-definition/equinox/repository/</url>
                 </repository>
             </repositories>
         </profile>
diff --git a/kura/features/pom.xml b/kura/features/pom.xml
index f7f89988832..5e8bbc8d156 100644
--- a/kura/features/pom.xml
+++ b/kura/features/pom.xml
@@ -33,9 +33,9 @@
 
     <repositories>
         <repository>
-            <id>p2-repo-equinox_3.16.0</id>
+            <id>p2-repo-equinox</id>
             <layout>p2</layout>
-            <url>file:///${basedir}/../../../target-platform/p2-repo-equinox_3.16.0/target/repository/</url>
+            <url>file:///${basedir}/../../../target-platform/p2-repo-equinox/target/repository/</url>
         </repository>
         <repository>
             <id>p2-repo-common</id>
diff --git a/kura/tools/archetype/example/src/main/resources/META-INF/maven/archetype-metadata.xml b/kura/tools/archetype/example/src/main/resources/META-INF/maven/archetype-metadata.xml
index b7eac5a7af7..ffe12490b44 100644
--- a/kura/tools/archetype/example/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/kura/tools/archetype/example/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -39,7 +39,7 @@
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>target-definition/equinox_3.16.0</directory>
+      <directory>target-definition/equinox</directory>
       <includes>
         <include>**/*.xml</include>
       </includes>
diff --git a/kura/tools/archetype/example/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml b/kura/tools/archetype/example/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
index 0bf49e43813..9f0a178380c 100644
--- a/kura/tools/archetype/example/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
+++ b/kura/tools/archetype/example/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml
@@ -9,9 +9,9 @@
 
     <repositories>
         <repository>
-            <id>p2-repo-equinox_3.16.0</id>
+            <id>p2-repo-equinox</id>
             <layout>p2</layout>
-            <url>file://${basedir}/../target-definition/equinox_3.16.0/repository/</url>
+            <url>file://${basedir}/../target-definition/equinox/repository/</url>
         </repository>
         <repository>
             <id>p2-repo-common</id>
diff --git a/target-platform/config/kura.target-platform.build.properties b/target-platform/config/kura.target-platform.build.properties
index 4652378808a..dab11b567c4 100644
--- a/target-platform/config/kura.target-platform.build.properties
+++ b/target-platform/config/kura.target-platform.build.properties
@@ -127,6 +127,26 @@ org.eclipse.osgi-technology.rest.version=1.2.3
 org.osgi.service.http.whiteboard.version=1.1.1
 org.osgi.service.jakartars.version=2.0.0
 org.osgi.service.servlet.version=2.0.0
+
+org.osgi.service.cm.version=1.6.1.202109301733
+org.osgi.service.component.version=1.5.1.202212101352
+org.osgi.service.coordinator.version=1.0.2.201505202024
+org.osgi.service.device.version=1.1.1.202109301733
+org.osgi.service.event.version=1.4.1.202109301733
+org.osgi.service.log.stream.version=1.0.0.202109301733
+org.osgi.service.metatype.version=1.4.1.202109301733
+org.osgi.service.prefs.version=1.1.2.202109301733
+org.osgi.service.provisioning.version=1.2.0.201505202024
+org.osgi.service.upnp.version=1.2.1.202109301733
+org.osgi.service.useradmin.version=1.1.1.202109301733
+org.osgi.service.wireadmin.version=1.0.2.202109301733
+org.osgi.util.function.version=1.2.0.202109301733
+org.osgi.util.measurement.version=1.0.2.201802012109
+org.osgi.util.position.version=1.0.1.201505202026
+org.osgi.util.promise.version=1.3.0.202212101352
+org.osgi.util.pushstream.version=1.1.0.202212101352
+org.osgi.util.xml.version=1.0.2.202109301733
+
 org.knowhowlab.osgi.monitoradmin.version=1.0.3
 org.apache.felix.useradmin.version=1.0.4.k1
 com.fasterxml.jackson.version=2.18.2
diff --git a/target-platform/p2-repo-equinox/pom.xml b/target-platform/p2-repo-equinox/pom.xml
index c53fe9a0a3f..e6788fb5179 100644
--- a/target-platform/p2-repo-equinox/pom.xml
+++ b/target-platform/p2-repo-equinox/pom.xml
@@ -270,7 +270,6 @@
                                         <exclude name="plugins/org.eclipse.equinox.console.ssh*.jar" />
                                         <exclude name="plugins/org.eclipse.equinox.simpleconfig*.jar" />
                                         <exclude name="plugins/org.eclipse.equinox.http.servletbridge*.jar" />
-                                        <exclude name="plugins/org.eclipse.equinox.http.service.api*.jar" />
 
                                         <include name="plugins/org.eclipse.equinox.launcher_*.jar" />
                                         <include name="plugins/org.eclipse.equinox.launcher.source_*.jar" />