diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2b82745b..1c242dcc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Gradle version
       run: ./gradlew --no-daemon --version
     - name: Build with Gradle
-      run: ./gradlew build -x testOSGi
+      run: ./gradlew build -x itest
     - name: Upload Test Reports
       if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
       uses: actions/upload-artifact@v2
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 883b782e..8aa73bd8 100755
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -34,4 +34,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build sonarqube -x test -x testOSGi --info --stacktrace
+        run: ./gradlew build sonarqube -x test -x itest --info --stacktrace
diff --git a/org.gecko.emf.util.bnd.library.workspace/bnd.bnd b/org.gecko.emf.util.bnd.library.workspace/bnd.bnd
index a9b093c9..81b71944 100644
--- a/org.gecko.emf.util.bnd.library.workspace/bnd.bnd
+++ b/org.gecko.emf.util.bnd.library.workspace/bnd.bnd
@@ -1 +1,9 @@
--resourceonly: true
\ No newline at end of file
+-resourceonly: true
+
+Provide-Capability: \
+	${gecko-base}
+
+gecko-base:\
+    bnd.library;\
+        bnd.library     = geckoEMFUtil; \
+        path            = template