diff --git a/org.eclipse.osbp.technologystack.feature/feature.xml b/org.eclipse.osbp.technologystack.feature/feature.xml
index 08f8a55..9425bec 100644
--- a/org.eclipse.osbp.technologystack.feature/feature.xml
+++ b/org.eclipse.osbp.technologystack.feature/feature.xml
@@ -147,6 +147,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.osbp.fork.tapiji.feature"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.osbp.gitinfo.feature"
          version="0.0.0"/>
 
diff --git a/org.eclipse.osbp.technologystack.feature/pom.xml b/org.eclipse.osbp.technologystack.feature/pom.xml
index 0a534f8..d31ef57 100644
--- a/org.eclipse.osbp.technologystack.feature/pom.xml
+++ b/org.eclipse.osbp.technologystack.feature/pom.xml
@@ -170,11 +170,18 @@
 			<type>eclipse-feature</type>
 		</dependency>
 		<dependency>
-		<groupId>org.eclipse.babel.plugins</groupId>
-		<artifactId>org.eclipse.babel.tapiji.tools.java.feature</artifactId>
-		<version>0.9.1-SNAPSHOT</version>
-		<type>eclipse-feature</type>
+			<groupId>org.eclipse.osbp.fork.tapiji</groupId>
+			<artifactId>org.eclipse.osbp.fork.tapiji.feature</artifactId>
+			<version>${project.version}</version>
+			<type>eclipse-feature</type>
+			<scope>provided</scope>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.eclipse.babel.plugins</groupId> -->
+		<!-- <artifactId>org.eclipse.babel.tapiji.tools.java.feature</artifactId> -->
+		<!-- <version>0.9.1-SNAPSHOT</version> -->
+		<!-- <type>eclipse-feature</type> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.eclipse.osbp.fork.jpos</groupId>
 			<artifactId>org.eclipse.osbp.fork.jpos.feature</artifactId>
diff --git a/org.eclipse.osbp.technologystack.p2/.osbp.releng.eclipse.p2 b/org.eclipse.osbp.technologystack.p2/.osbp.releng.eclipse.technologystack.p2
similarity index 100%
rename from org.eclipse.osbp.technologystack.p2/.osbp.releng.eclipse.p2
rename to org.eclipse.osbp.technologystack.p2/.osbp.releng.eclipse.technologystack.p2