diff --git a/.github/workflows/ci-http.yml b/.github/workflows/ci-http.yml
deleted file mode 100644
index cc713fdc2d..0000000000
--- a/.github/workflows/ci-http.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Github CI Build - HTTP
-
-on:
-  push:
-    branches: [ "master" ]
-    paths:
-      - 'http/**'
-  pull_request:
-    branches: [ "master" ]
-    paths:
-      - 'http/**'
-    
-permissions: {}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
-      with:
-        maven-version: 3.9.7
-    - name: Felix HTTP
-      run: mvn -B -V -Dstyle.color=always "-Dit.test=!MissingWebsocketDependenciesIT" --file http/pom.xml clean install verify
-    - name: Upload Test Results
-      if: always()
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-      with:
-        name: test-results
-        if-no-files-found: warn
-        path: |
-          ${{ github.workspace }}/**/target/surefire-reports/*.xml
-          ${{ github.workspace }}/**/target/failsafe-reports/*.xml
diff --git a/.github/workflows/ci-scr.yml b/.github/workflows/ci-scr.yml
deleted file mode 100644
index e28c170bf5..0000000000
--- a/.github/workflows/ci-scr.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Github CI Build - SCR
-
-on:
-  push:
-    branches: [ "master" ]
-    paths:
-      - 'scr/**'
-  pull_request:
-    branches: [ "master" ]
-    paths:
-      - 'scr/**'
-    
-permissions: {}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-        cache: maven
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
-      with:
-        maven-version: 3.9.7
-    - name: Felix SCR
-      run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify
-    - name: Upload Test Results
-      if: always()
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-      with:
-        name: test-results
-        if-no-files-found: warn
-        path: |
-          ${{ github.workspace }}/**/target/surefire-reports/*.xml
-          ${{ github.workspace }}/**/target/failsafe-reports/*.xml
diff --git a/.github/workflows/ci-maven-bundle-plugin.yml b/.github/workflows/maven-ci.yml
similarity index 55%
rename from .github/workflows/ci-maven-bundle-plugin.yml
rename to .github/workflows/maven-ci.yml
index e955e04984..e3acc684f9 100644
--- a/.github/workflows/ci-maven-bundle-plugin.yml
+++ b/.github/workflows/maven-ci.yml
@@ -1,13 +1,17 @@
-name: Github CI Build - Maven bundle plugin
+name: Github CI Build
 
 on:
   push:
     branches: [ "master" ]
     paths:
+      - 'scr/**'
+      - 'http/**'
       - 'tools/maven-bundle-plugin/**'
   pull_request:
     branches: [ "master" ]
     paths:
+      - 'scr/**'
+      - 'http/**'
       - 'tools/maven-bundle-plugin/**'
     
 permissions: {}
@@ -27,7 +31,26 @@ jobs:
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
         maven-version: 3.9.7
-    - name: Felix maven-bundle-plugin
+    - name: Check which subproject changed and build affected ones
+      uses: dorny/paths-filter@v3
+      id: changes
+      with:
+        filters: |
+          scr:
+            - 'scr/**'
+          http:
+            - 'http/**'
+          maven-bundle-plugin:
+            - 'tools/maven-bundle-plugin/**'
+
+    - name: Felix SCR
+      if: steps.changes.outputs.scr == 'true'
+      run: mvn -B -V -Dstyle.color=always --file scr/pom.xml clean verify
+    - name: Felix HTTP 
+      if: steps.changes.outputs.http == 'true'
+      run: mvn -B -V -Dstyle.color=always "-Dit.test=!MissingWebsocketDependenciesIT" --file http/pom.xml clean install verify
+    - name: Felix Maven bundle plugin 
+      if: steps.changes.outputs.maven-bundle-plugin == 'true'
       run: mvn -B -V -Dstyle.color=always --file tools/maven-bundle-plugin/pom.xml clean install verify
     - name: Upload Test Results
       if: always()