diff --git a/.github/workflows/spring-boot-2-matrix.yml b/.github/workflows/spring-boot-2-matrix.yml
index dfe742087d..316958e302 100644
--- a/.github/workflows/spring-boot-2-matrix.yml
+++ b/.github/workflows/spring-boot-2-matrix.yml
@@ -65,88 +65,63 @@ jobs:
           sed -i 's/^springboot2=.*/springboot2=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
           echo "Updated Spring Boot 2.x version to ${{ matrix.springboot-version }}"
 
-      - name: Exclude android modules from build
+      - name: Build sample artifacts
         run: |
-          sed -i \
-            -e '/.*"sentry-android-ndk",/d' \
-            -e '/.*"sentry-android",/d' \
-            -e '/.*"sentry-compose",/d' \
-            -e '/.*"sentry-android-core",/d' \
-            -e '/.*"sentry-android-fragment",/d' \
-            -e '/.*"sentry-android-navigation",/d' \
-            -e '/.*"sentry-android-sqlite",/d' \
-            -e '/.*"sentry-android-timber",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
-            -e '/.*"sentry-samples:sentry-samples-android",/d' \
-            -e '/.*"sentry-android-replay",/d' \
-            settings.gradle.kts
-
-      - name: Exclude android modules from ignore list
-        run: |
-          sed -i \
-            -e '/.*"sentry-uitest-android",/d' \
-            -e '/.*"sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-uitest-android-critical",/d' \
-            -e '/.*"test-app-sentry",/d' \
-            -e '/.*"test-app-size",/d' \
-            -e '/.*"sentry-samples-android",/d' \
-            build.gradle.kts
-
-      - name: Build SDK
-        run: |
-          ./gradlew assemble --parallel
+          ./gradlew \
+            :sentry-samples:sentry-samples-spring-boot:shadowJar \
+            :sentry-samples:sentry-samples-spring-boot:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-webflux:shadowJar \
+            :sentry-samples:sentry-samples-spring-boot-webflux:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
+            :sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:shadowJar \
+            :sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:testClasses \
+            :sentry-samples:sentry-samples-spring:war \
+            :sentry-samples:sentry-samples-spring:testClasses \
+            :sentry-opentelemetry:sentry-opentelemetry-agent:assemble \
+            --parallel
 
       - name: Test sentry-samples-spring-boot
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-webflux
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-webflux" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-opentelemetry agent init true
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-opentelemetry" \
             --agent true \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-opentelemetry agent init false
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-opentelemetry" \
             --agent true \
-            --auto-init "false" \
-            --build "true"
+            --auto-init "false"
 
       - name: Test sentry-samples-spring-boot-opentelemetry-noagent
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-opentelemetry-noagent" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Upload test results
         if: always()
diff --git a/.github/workflows/spring-boot-3-matrix.yml b/.github/workflows/spring-boot-3-matrix.yml
index 577f014417..c32e0ce18e 100644
--- a/.github/workflows/spring-boot-3-matrix.yml
+++ b/.github/workflows/spring-boot-3-matrix.yml
@@ -65,88 +65,63 @@ jobs:
           sed -i 's/^springboot3=.*/springboot3=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
           echo "Updated Spring Boot 3.x version to ${{ matrix.springboot-version }}"
 
-      - name: Exclude android modules from build
+      - name: Build sample artifacts
         run: |
-          sed -i \
-            -e '/.*"sentry-android-ndk",/d' \
-            -e '/.*"sentry-android",/d' \
-            -e '/.*"sentry-compose",/d' \
-            -e '/.*"sentry-android-core",/d' \
-            -e '/.*"sentry-android-fragment",/d' \
-            -e '/.*"sentry-android-navigation",/d' \
-            -e '/.*"sentry-android-sqlite",/d' \
-            -e '/.*"sentry-android-timber",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
-            -e '/.*"sentry-samples:sentry-samples-android",/d' \
-            -e '/.*"sentry-android-replay",/d' \
-            settings.gradle.kts
-
-      - name: Exclude android modules from ignore list
-        run: |
-          sed -i \
-            -e '/.*"sentry-uitest-android",/d' \
-            -e '/.*"sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-uitest-android-critical",/d' \
-            -e '/.*"test-app-sentry",/d' \
-            -e '/.*"test-app-size",/d' \
-            -e '/.*"sentry-samples-android",/d' \
-            build.gradle.kts
-
-      - name: Build SDK
-        run: |
-          ./gradlew assemble --parallel
+          ./gradlew \
+            :sentry-samples:sentry-samples-spring-boot-jakarta:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-jakarta:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-webflux-jakarta:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-webflux-jakarta:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:testClasses \
+            :sentry-samples:sentry-samples-spring-jakarta:war \
+            :sentry-samples:sentry-samples-spring-jakarta:testClasses \
+            :sentry-opentelemetry:sentry-opentelemetry-agent:assemble \
+            --parallel
 
       - name: Test sentry-samples-spring-boot-jakarta
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-jakarta" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-webflux-jakarta
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-webflux-jakarta" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init true
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-jakarta-opentelemetry" \
             --agent true \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init false
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-jakarta-opentelemetry" \
             --agent true \
-            --auto-init "false" \
-            --build "true"
+            --auto-init "false"
 
       - name: Test sentry-samples-spring-boot-jakarta-opentelemetry-noagent
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Test sentry-samples-spring-jakarta
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-jakarta" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Upload test results
         if: always()
diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml
index 5246cf90cd..733e91ffc8 100644
--- a/.github/workflows/spring-boot-4-matrix.yml
+++ b/.github/workflows/spring-boot-4-matrix.yml
@@ -65,88 +65,63 @@ jobs:
           sed -i 's/^springboot4=.*/springboot4=${{ matrix.springboot-version }}/' gradle/libs.versions.toml
           echo "Updated Spring Boot 4.x version to ${{ matrix.springboot-version }}"
 
-      - name: Exclude android modules from build
+      - name: Build sample artifacts
         run: |
-          sed -i \
-            -e '/.*"sentry-android-ndk",/d' \
-            -e '/.*"sentry-android",/d' \
-            -e '/.*"sentry-compose",/d' \
-            -e '/.*"sentry-android-core",/d' \
-            -e '/.*"sentry-android-fragment",/d' \
-            -e '/.*"sentry-android-navigation",/d' \
-            -e '/.*"sentry-android-sqlite",/d' \
-            -e '/.*"sentry-android-timber",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android",/d' \
-            -e '/.*"sentry-android-integration-tests:sentry-uitest-android-critical",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-sentry",/d' \
-            -e '/.*"sentry-android-integration-tests:test-app-size",/d' \
-            -e '/.*"sentry-samples:sentry-samples-android",/d' \
-            -e '/.*"sentry-android-replay",/d' \
-            settings.gradle.kts
-
-      - name: Exclude android modules from ignore list
-        run: |
-          sed -i \
-            -e '/.*"sentry-uitest-android",/d' \
-            -e '/.*"sentry-uitest-android-benchmark",/d' \
-            -e '/.*"sentry-uitest-android-critical",/d' \
-            -e '/.*"test-app-sentry",/d' \
-            -e '/.*"test-app-size",/d' \
-            -e '/.*"sentry-samples-android",/d' \
-            build.gradle.kts
-
-      - name: Build SDK
-        run: |
-          ./gradlew assemble --parallel
+          ./gradlew \
+            :sentry-samples:sentry-samples-spring-boot-4:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-4:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-4-webflux:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-4-webflux:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry:testClasses \
+            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:bootJar \
+            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:testClasses \
+            :sentry-samples:sentry-samples-spring-7:war \
+            :sentry-samples:sentry-samples-spring-7:testClasses \
+            :sentry-opentelemetry:sentry-opentelemetry-agent:assemble \
+            --parallel
 
       - name: Run sentry-samples-spring-boot-4
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-4" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Run sentry-samples-spring-boot-4-webflux
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-4-webflux" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Run sentry-samples-spring-boot-4-opentelemetry agent init true
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-4-opentelemetry" \
             --agent true \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Run sentry-samples-spring-boot-4-opentelemetry agent init false
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-4-opentelemetry" \
             --agent true \
-            --auto-init "false" \
-            --build "true"
+            --auto-init "false"
 
       - name: Run sentry-samples-spring-boot-4-opentelemetry-noagent
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-boot-4-opentelemetry-noagent" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Run sentry-samples-spring-7
         run: |
           python3 test/system-test-runner.py test \
             --module "sentry-samples-spring-7" \
             --agent false \
-            --auto-init "true" \
-            --build "true"
+            --auto-init "true"
 
       - name: Upload test results
         if: always()