diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b75121de9..9f9d2a415 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,6 +80,7 @@ jobs:
             target/release/espresso-dev-node
             target/release/pub-key
             target/release/espresso-bridge
+            target/release/marketplace-solver
 
   build-arm:
     runs-on: buildjet-4vcpu-ubuntu-2204-arm
@@ -131,6 +132,7 @@ jobs:
             target/release/espresso-dev-node
             target/release/pub-key
             target/release/espresso-bridge
+            target/release/marketplace-solver
 
   build-dockers:
     runs-on: ubuntu-latest
@@ -150,6 +152,7 @@ jobs:
       nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
       espresso-dev-node-tag: ${{ steps.espresso-dev-node.outputs.tags }}
       bridge-tag: ${{ steps.bridge.outputs.tags }}
+      marketplace-solver-tag: ${{ steps.marketplace-solver.outputs.tags }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -446,6 +449,8 @@ jobs:
           docker pull ${{ needs.build-dockers.outputs.builder-tag }}
           docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
           docker pull ${{ needs.build-dockers.outputs.bridge-tag }}
+          docker pull ${{ needs.build-dockers.outputs.marketplace-solver-tag }}
+          
       - name: Tag new docker images
         run: |
           docker tag ${{ needs.build-dockers.outputs.sequencer-tag }} ghcr.io/espressosystems/espresso-sequencer/sequencer:main
@@ -461,6 +466,7 @@ jobs:
           docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main
           docker tag ${{ needs.build-dockers.outputs.nasty-client-tag }} ghcr.io/espressosystems/espresso-sequencer/nasty-client:main
           docker tag ${{ needs.build-dockers.outputs.bridge-tag }} ghcr.io/espressosystems/espresso-sequencer/bridge:main
+          docker tag ${{ needs.build-dockers.outputs.marketplace-solver-tag }} ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main
 
       - name: Test docker demo
         run: |
diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
index 5eddf5f4f..73187114b 100644
--- a/.github/workflows/build_static.yml
+++ b/.github/workflows/build_static.yml
@@ -91,6 +91,7 @@ jobs:
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/pub-key
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-bridge
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-dev-node
+             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/marketplace-solver
 
   static-dockers:
     runs-on: ubuntu-latest
diff --git a/scripts/build-docker-images-native b/scripts/build-docker-images-native
index 6f42fe987..6037ce137 100755
--- a/scripts/build-docker-images-native
+++ b/scripts/build-docker-images-native
@@ -87,7 +87,7 @@ mkdir -p ${WORKDIR}/data
 cp -rv data/genesis ${WORKDIR}/data/
 
 mkdir -p "${WORKDIR}/target/$ARCH/release"
-for binary in "orchestrator" "cdn-broker" "cdn-marshal" "cdn-whitelist" "sequencer" "commitment-task" "submit-transactions" "reset-storage" "state-relay-server" "state-prover" "deploy" "keygen" "permissionless-builder" "nasty-client" "pub-key" "espresso-bridge" "espresso-dev-node"; do
+for binary in "orchestrator" "cdn-broker" "cdn-marshal" "cdn-whitelist" "sequencer" "commitment-task" "submit-transactions" "reset-storage" "state-relay-server" "state-prover" "deploy" "keygen" "permissionless-builder" "nasty-client" "pub-key" "espresso-bridge" "espresso-dev-node" "marketplace-solver"; do
   cp -v "${CARGO_TARGET_DIR}/release/$binary" "${WORKDIR}/target/$ARCH/release"
   # Patch the interpreter for running without nix inside the ubuntu based docker image.
   if [ $KERNEL == "linux" ]; then
diff --git a/sequencer/src/bin/marketplace-solver.rs b/sequencer/src/bin/marketplace-solver.rs
index c44f94e30..5b9648d92 100644
--- a/sequencer/src/bin/marketplace-solver.rs
+++ b/sequencer/src/bin/marketplace-solver.rs
@@ -81,7 +81,8 @@ async fn main() -> anyhow::Result<()> {
     app.register_module::<SolverError, Version>("marketplace-solver", api)?;
 
     app.serve(format!("0.0.0.0:{}", solver_api_port), Version::instance())
-        .await?;
+        .await
+        .unwrap();
 
     event_handler.cancel().await;