diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7639f7bee..06430d0b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,7 @@ concurrency:
 env:
   RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
   RUST_LOG: info,libp2p=off,node=error
+  CARGO_TERM_COLOR: always
 
 jobs:
   test:
@@ -54,8 +55,6 @@ jobs:
         timeout-minutes: 90
 
       - name: Test
-        env:
-          CARGO_TERM_COLOR: always
         # Build test binary with `testing` feature, which requires `hotshot_example` config
         run: |
           export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
@@ -67,17 +66,38 @@ jobs:
         uses: cachix/install-nix-action@V27
 
       - name: Install process-compose
+        run: nix profile install nixpkgs#process-compose
+
+      - name: Pull Docker Images
+        run: docker compose pull || docker-compose pull
+
+      - name: Run Demo-Native
         run: |
-          nix profile install nixpkgs#process-compose
+          export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
+          export PATH="$PWD/target/release:$PATH"
+          bash -x scripts/demo-native -D
 
       - name: Test Integration
         env:
-          CARGO_TERM_COLOR: always
           NEXTEST_PROFILE: integration
+        run: cargo nextest run --locked --release --all-features --verbose --nocapture
+        timeout-minutes: 40
+
+      - name: Process Compose Down
+        run: process-compose down
+
+      - name: Run Demo-Native Marketplace
         run: |
           export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
           export PATH="$PWD/target/release:$PATH"
-          docker compose pull || docker-compose pull
-          bash -x scripts/demo-native -D
-          cargo nextest run --locked --release --all-features --verbose --nocapture
+          bash -x scripts/demo-native  -f process-compose.yaml -f process-compose-mp.yml -D
+        
+      - name: Test Marketplace Integration
+        env:
+          NEXTEST_PROFILE: integration
+          MARKETPLACE_SMOKE_TEST: true
+        run: cargo nextest run --locked --release --all-features --verbose --nocapture
         timeout-minutes: 40
+
+      - name: Process Compose Down
+        run: process-compose down
diff --git a/tests/demo_native.rs b/tests/demo_native.rs
index 0dadf67e9..721d27ea2 100644
--- a/tests/demo_native.rs
+++ b/tests/demo_native.rs
@@ -196,7 +196,7 @@ impl TestConfig {
     async fn readiness(&self) -> Result<Vec<String>> {
         join_all(vec![
             wait_for_service(&self.load_generator_url, 1000, 600),
-            wait_for_service(&self.builder_url, 1000, 60),
+            wait_for_service(&self.builder_url, 1000, 200),
             wait_for_service(&self.prover_url, 1000, 300),
         ])
         .await