diff --git a/osgi-featuremodel/pom.xml b/osgi-featuremodel/pom.xml
index 9418ad8fc..72c530b9e 100644
--- a/osgi-featuremodel/pom.xml
+++ b/osgi-featuremodel/pom.xml
@@ -31,6 +31,18 @@
         <sling.java.version>11</sling.java.version>
     </properties>
 
+	<repositories>
+		<repository>
+			<id>snapshots-repo</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
     <build>
         <plugins>
             <plugin>
@@ -42,11 +54,10 @@
                     </archive>
                 </configuration>
             </plugin>
-            <!-- 
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
-                <version>4.3.1</version>
+                <version>5.3.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -56,12 +67,14 @@
                 </executions>
                 <configuration>
                     <bnd><![CDATA[
+                        Bundle-Activator: org.apache.sling.feature.osgi.impl.Activator
+                        Export-Package: org.osgi.service.feature
                         -exportcontents: ${packages;VERSIONED}
                         -removeheaders: Private-Package,Include-Resource
                     ]]></bnd>
                 </configuration>
             </plugin>
-            -->
+
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
@@ -83,8 +96,14 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-            <version>8.0.0</version>
+            <artifactId>org.osgi.framework</artifactId>
+            <version>1.8.0</version>
+            <scope>provided</scope>
+        </dependency> 
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.feature</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>     
         <dependency>
diff --git a/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/Activator.java b/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/Activator.java
new file mode 100644
index 000000000..d633356f1
--- /dev/null
+++ b/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/Activator.java
@@ -0,0 +1,31 @@
+package org.apache.sling.feature.osgi.impl;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.feature.FeatureService;
+
+public class Activator implements BundleActivator {
+
+	private ServiceRegistration<FeatureService> reg = null;
+
+	@Override
+	public void start(BundleContext context) throws Exception {
+
+		Dictionary<String, Object> dict = new Hashtable<>();
+		dict.put(Constants.SERVICE_VENDOR, "sling");
+
+		reg = context.registerService(FeatureService.class, new FeatureServiceImpl(), dict);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		reg.unregister();
+
+	}
+
+}
diff --git a/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/FeatureServiceImpl.java b/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/FeatureServiceImpl.java
index ed1fd5e3f..260fa33ff 100644
--- a/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/FeatureServiceImpl.java
+++ b/osgi-featuremodel/src/main/java/org/apache/sling/feature/osgi/impl/FeatureServiceImpl.java
@@ -39,9 +39,10 @@
 import org.osgi.service.feature.FeatureConfigurationBuilder;
 import org.osgi.service.feature.FeatureExtension;
 import org.osgi.service.feature.FeatureExtensionBuilder;
+import org.osgi.service.feature.FeatureService;
 import org.osgi.service.feature.ID;
 
-public class FeatureServiceImpl {
+public class FeatureServiceImpl implements FeatureService {
     private final BuilderFactoryImpl builderFactory = new BuilderFactoryImpl();
 
     public BuilderFactory getBuilderFactory() {