diff --git a/containers-docker-local/pom.xml b/containers-docker-local/pom.xml
index 6c78d4f..c2d97d6 100644
--- a/containers-docker-local/pom.xml
+++ b/containers-docker-local/pom.xml
@@ -35,7 +35,7 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
index b092d60..73e85ce 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ContainerImpl.java
@@ -25,7 +25,7 @@
 import org.apache.aries.containers.Container;
 import org.apache.aries.containers.Service;
 
-public class ContainerImpl implements Container {
+class ContainerImpl implements Container {
     private final String id;
     private final String ip;
     private final Map<Integer, Integer> ports;
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
index 78b74b8..1b89f93 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/LocalDockerController.java
@@ -23,8 +23,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class LocalDockerController {
-
+class LocalDockerController {
     public String kill(String id) throws Exception {
         return kill(id, "KILL");
     }
diff --git a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
index cace802..4f2acd6 100644
--- a/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
+++ b/containers-docker-local/src/main/java/org/apache/aries/containers/docker/local/impl/ServiceImpl.java
@@ -26,7 +26,7 @@
 import org.apache.aries.containers.Service;
 import org.apache.aries.containers.ServiceConfig;
 
-public class ServiceImpl implements Service {
+class ServiceImpl implements Service {
     private final ServiceConfig config;
     private final List<ContainerImpl> containers;
     private final LocalDockerContainerFactory factory;
diff --git a/containers-parent/pom.xml b/containers-parent/pom.xml
index 3cd7b42..2149d4e 100644
--- a/containers-parent/pom.xml
+++ b/containers-parent/pom.xml
@@ -66,7 +66,13 @@
         <dependencies>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
+                <artifactId>osgi.core</artifactId>
+                <version>6.0.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>osgi.cmpn</artifactId>
                 <version>6.0.0</version>
             </dependency>
         </dependencies>