diff --git a/distribution/sensinact-distribution-generator/pom.xml b/distribution/sensinact-distribution-generator/pom.xml
index 2408799..325be82 100644
--- a/distribution/sensinact-distribution-generator/pom.xml
+++ b/distribution/sensinact-distribution-generator/pom.xml
@@ -168,7 +168,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.osgi</groupId>
-                                    <artifactId>org.osgi.compendium</artifactId>
+                                    <artifactId>osgi.cmpn</artifactId>
                                     <version>${osgi.compendium.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
diff --git a/distribution/sensinact-distribution-generator/profile/pom.xml b/distribution/sensinact-distribution-generator/profile/pom.xml
index 9ca55f4..f4801c6 100644
--- a/distribution/sensinact-distribution-generator/profile/pom.xml
+++ b/distribution/sensinact-distribution-generator/profile/pom.xml
@@ -29,6 +29,8 @@
     <properties>
         <excludeArtifactId>
             slf4j-api,
+            org.osgi.core,
+            osgi.cmpn,
             sensinact-generic,
             sensinact-core,
             sensinact-utils,
@@ -37,7 +39,7 @@
             json,
             asm-all
         </excludeArtifactId>
-        <excludeGroupId>org.osgi.core</excludeGroupId> <!-- org.apache.felix,-->
+        <excludeGroupId></excludeGroupId> <!-- org.apache.felix,-->
         <excludeTransitive>true</excludeTransitive>
     </properties>
 
diff --git a/distribution/sensinact-distribution-template/conf/config.properties b/distribution/sensinact-distribution-template/conf/config.properties
index 87e4e5a..b0fdd12 100644
--- a/distribution/sensinact-distribution-template/conf/config.properties
+++ b/distribution/sensinact-distribution-template/conf/config.properties
@@ -31,6 +31,7 @@
  javax.smartcardio,\
  javax.net.ssl,\
  javax.mail, \
+ javax.microedition.io, \
  javax.mail.internet, \
  com.google.common.base, \
  sun.misc
@@ -99,9 +100,11 @@
   file:bundle/1/slf4j-api-${slf4j.version}.jar \
   file:bundle/1/slf4j-simple-${slf4j.version}.jar
 
+felix.auto.install.2= \
+  file:bundle/2/osgi.cmpn-${osgi.compendium.version}.jar
+
 felix.auto.start.2= \
   file:bundle/2/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar \
-  file:bundle/2/org.osgi.compendium-${osgi.compendium.version}.jar \
   file:bundle/2/org.apache.felix.configadmin-1.9.10.jar \
   file:bundle/2/org.osgi.service.event-1.4.0.jar \
   file:bundle/2/sensinact-framework-extension-${project.version}.jar \
diff --git a/platform/northbound/geo-filtering/geojson-filter/pom.xml b/platform/northbound/geo-filtering/geojson-filter/pom.xml
index 12e95af..004dd69 100644
--- a/platform/northbound/geo-filtering/geojson-filter/pom.xml
+++ b/platform/northbound/geo-filtering/geojson-filter/pom.xml
@@ -148,7 +148,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/northbound/http-tools/pom.xml b/platform/northbound/http-tools/pom.xml
index d6e339c..bd3bed4 100644
--- a/platform/northbound/http-tools/pom.xml
+++ b/platform/northbound/http-tools/pom.xml
@@ -182,7 +182,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/northbound/jsonpath-filtering/jsonpath-filter/pom.xml b/platform/northbound/jsonpath-filtering/jsonpath-filter/pom.xml
index 4eec019..6c1f8f2 100644
--- a/platform/northbound/jsonpath-filtering/jsonpath-filter/pom.xml
+++ b/platform/northbound/jsonpath-filtering/jsonpath-filter/pom.xml
@@ -18,7 +18,7 @@
 			<groupId>org.eclipse.sensinact.gateway</groupId>
 			<artifactId>sensinact-core</artifactId>
 			<version>${project.version}</version>
-            <scope>provided</scope>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.sensinact.gateway</groupId>
@@ -146,7 +146,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/northbound/ldap-filtering/ldap-filter/pom.xml b/platform/northbound/ldap-filtering/ldap-filter/pom.xml
index fca3139..903f375 100644
--- a/platform/northbound/ldap-filtering/ldap-filter/pom.xml
+++ b/platform/northbound/ldap-filtering/ldap-filter/pom.xml
@@ -179,7 +179,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/northbound/rest-access/pom.xml b/platform/northbound/rest-access/pom.xml
index 20f6952..e9ecaac 100644
--- a/platform/northbound/rest-access/pom.xml
+++ b/platform/northbound/rest-access/pom.xml
@@ -172,7 +172,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/pom.xml b/platform/pom.xml
index 567b432..abd5460 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -70,16 +70,6 @@
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
-		</dependency>  		
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.compendium</artifactId>
-			<scope>provided</scope>
 		</dependency>
 	    <dependency>
 	      <groupId>org.powermock</groupId>
diff --git a/platform/sensinact-common/pom.xml b/platform/sensinact-common/pom.xml
index 987c2a1..3e9eef8 100644
--- a/platform/sensinact-common/pom.xml
+++ b/platform/sensinact-common/pom.xml
@@ -50,7 +50,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>3.5.1</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
diff --git a/platform/sensinact-generic/pom.xml b/platform/sensinact-generic/pom.xml
index 0b31a14..a617ea3 100644
--- a/platform/sensinact-generic/pom.xml
+++ b/platform/sensinact-generic/pom.xml
@@ -231,7 +231,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/sensinact-remote/http-endpoint-sample/pom.xml b/platform/sensinact-remote/http-endpoint-sample/pom.xml
index 92d36bb..82fcf13 100644
--- a/platform/sensinact-remote/http-endpoint-sample/pom.xml
+++ b/platform/sensinact-remote/http-endpoint-sample/pom.xml
@@ -136,7 +136,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/sensinact-remote/socket-endpoint-sample/pom.xml b/platform/sensinact-remote/socket-endpoint-sample/pom.xml
index 06373e4..7f0d59f 100644
--- a/platform/sensinact-remote/socket-endpoint-sample/pom.xml
+++ b/platform/sensinact-remote/socket-endpoint-sample/pom.xml
@@ -141,7 +141,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/sensinact-security/sensinact-security-core/pom.xml b/platform/sensinact-security/sensinact-security-core/pom.xml
index 73b0066..2b87361 100644
--- a/platform/sensinact-security/sensinact-security-core/pom.xml
+++ b/platform/sensinact-security/sensinact-security-core/pom.xml
@@ -238,7 +238,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite b/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
index 1ed0d5b..69c4105 100644
--- a/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
+++ b/platform/sensinact-security/sensinact-security-core/src/test/resources/sensinact.sqlite
Binary files differ
diff --git a/platform/sensinact-utils/pom.xml b/platform/sensinact-utils/pom.xml
index 215eb08..5d49621 100644
--- a/platform/sensinact-utils/pom.xml
+++ b/platform/sensinact-utils/pom.xml
@@ -90,8 +90,6 @@
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
-						<Embed-Dependency>*;scope=compile</Embed-Dependency>
-						<Embed-Transitive>false</Embed-Transitive>
 						<_nouses>true</_nouses>
 						<_exportcontents>*</_exportcontents>
 						<Include-Resource>
diff --git a/platform/southbound/http/http-device/pom.xml b/platform/southbound/http/http-device/pom.xml
index 5affc1a..6521df6 100644
--- a/platform/southbound/http/http-device/pom.xml
+++ b/platform/southbound/http/http-device/pom.xml
@@ -124,7 +124,7 @@
 								</artifactItem>
 								<artifactItem>
 									<groupId>org.osgi</groupId>
-									<artifactId>org.osgi.compendium</artifactId>
+									<artifactId>osgi.cmpn</artifactId>
 									<version>${osgi.compendium.version}</version>
 									<outputDirectory>${project.build.directory}/felix/bundle</outputDirectory>
 									<destFileName>org.osgi.compendium.jar</destFileName>
diff --git a/platform/southbound/mqtt/mqtt-device/pom.xml b/platform/southbound/mqtt/mqtt-device/pom.xml
index 748c394..372a85b 100644
--- a/platform/southbound/mqtt/mqtt-device/pom.xml
+++ b/platform/southbound/mqtt/mqtt-device/pom.xml
@@ -64,10 +64,5 @@
             <artifactId>mqtt-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/platform/southbound/mqtt/mqtt-utils/pom.xml b/platform/southbound/mqtt/mqtt-utils/pom.xml
index 9666b60..0588217 100644
--- a/platform/southbound/mqtt/mqtt-utils/pom.xml
+++ b/platform/southbound/mqtt/mqtt-utils/pom.xml
@@ -48,10 +48,5 @@
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/platform/southbound/mqtt/smart-topic-device/pom.xml b/platform/southbound/mqtt/smart-topic-device/pom.xml
index 304d409..3df4059 100644
--- a/platform/southbound/mqtt/smart-topic-device/pom.xml
+++ b/platform/southbound/mqtt/smart-topic-device/pom.xml
@@ -67,10 +67,5 @@
             <artifactId>org.apache.felix.configadmin</artifactId>
             <version>1.9.10</version>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>${osgi.compendium.version}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 67e81bc..a10c089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
 	<name>sensiNact IoT Gateway - Gateway Project</name>
 
 	<distributionManagement>
+<!--
 		<repository>
 			<id>repo.eclipse.org</id>
 			<name>sensiNact Repository - Releases</name>
@@ -33,6 +34,7 @@
 			<url>https://repo.eclipse.org/content/repositories/sensinact-snapshots/</url>
 			<uniqueVersion>true</uniqueVersion>
 		</snapshotRepository>
+-->
 	</distributionManagement>
 
 	<repositories>
@@ -147,7 +149,7 @@
 		<felix.version>6.0.2</felix.version>
 		<logback.version>1.2.3</logback.version>
 		<felix.configadmin.version>1.9.10</felix.configadmin.version>
-		<osgi.compendium.version>5.0.0</osgi.compendium.version>
+		<osgi.compendium.version>6.0.0</osgi.compendium.version>
 		<junit.version>4.8.1</junit.version>
 		<org.apache.felix.gogo.runtime.version>1.1.0</org.apache.felix.gogo.runtime.version>
 		<org.jline.version>3.7.0</org.jline.version>
@@ -173,7 +175,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.compendium</artifactId>
+				<artifactId>osgi.cmpn</artifactId>
 				<version>${osgi.compendium.version}</version>
 			</dependency>
 			<dependency>
@@ -190,6 +192,14 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.cmpn</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.core</artifactId>
+		</dependency>
     </dependencies>
 
 	<profiles>
diff --git a/simulated-devices/pom.xml b/simulated-devices/pom.xml
index 9ffb391..6e0cbb6 100644
--- a/simulated-devices/pom.xml
+++ b/simulated-devices/pom.xml
@@ -27,18 +27,6 @@
 
     <name>sensiNact IoT Gateway - Simulated Devices</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
 
     <build>
         <pluginManagement>