diff --git a/.github/workflows/publish-aztec-packages.yml b/.github/workflows/publish-aztec-packages.yml
index 99fe5cc3bc5..4f4b16278b3 100644
--- a/.github/workflows/publish-aztec-packages.yml
+++ b/.github/workflows/publish-aztec-packages.yml
@@ -205,7 +205,7 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & push aztec blob sink image x86-64
         run: |
-          earthly-ci --no-output --push ./yarn-project+export-blob-sink --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
+          earthly-ci --no-output --push ./yarn-project+export-blob-sink-arch --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
 
   build-blob-sink-arm:
     needs: [configure, build-aztec-arm]
@@ -220,7 +220,7 @@ jobs:
           dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
       - name: Build & push aztec blob sink image arm
         run: |
-          earthly-ci --no-output --push ./yarn-project+export-blob-sink --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
+          earthly-ci --no-output --push ./yarn-project+export-blob-sink-arch --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
 
 
   publish-manifests:
diff --git a/build_manifest.yml b/build_manifest.yml
index 28982430bad..18bcca025a0 100644
--- a/build_manifest.yml
+++ b/build_manifest.yml
@@ -242,6 +242,13 @@ cli-wallet:
     - yarn-project
   multiarch: buildx
 
+blob-sink:
+  buildDir: yarn-project
+  projectDir: yarn-project/blob-sink
+  dependencies:
+    - yarn-project
+  multiarch: buildx
+
 # Builds all the boxes. They are then independently tested in the container.
 boxes:
   buildDir: boxes
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index ae0775dfe72..510c25d0a76 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -155,8 +155,12 @@ blob-sink:
 export-blob-sink:
     FROM +blob-sink
     ARG DIST_TAG="latest"
+    SAVE IMAGE aztecprotocol/blob-sink:${DIST_TAG}
+
+export-blob-sink-arch:
+    FROM +blob-sink
     ARG ARCH
-    SAVE IMAGE --push aztecprotocol/blob-sink:${DIST_TAG}${ARCH:+-$ARCH}
+    SAVE IMAGE --push aztecprotocol/blob-sink:${ARCH:+-$ARCH}
 
 aztec-prod:
     FROM +cli-base
diff --git a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
index 3dbfd94d352..fe8272130cc 100644
--- a/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
+++ b/yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
@@ -420,11 +420,9 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
 
   // TODO(md): will this revive state???
   const blobSink = await createBlobSinkService({
-    port: blobSinkPort,
-    dataStoreConfig: {
-      dataDirectory: statePath,
-      dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
-    },
+    port: 5052,
+    dataDirectory: statePath,
+    dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
   });
   await blobSink.start();
 
diff --git a/yarn-project/end-to-end/src/fixtures/utils.ts b/yarn-project/end-to-end/src/fixtures/utils.ts
index a83e76bc3b6..ed78c7cb7dd 100644
--- a/yarn-project/end-to-end/src/fixtures/utils.ts
+++ b/yarn-project/end-to-end/src/fixtures/utils.ts
@@ -367,7 +367,11 @@ export async function setup(
 
   // Blob sink service - blobs get posted here and served from here
   const blobSinkPort = await getPort();
-  const blobSink = await createBlobSinkService({ port: blobSinkPort });
+  const blobSink = await createBlobSinkService({
+    port: blobSinkPort,
+    dataDirectory: undefined,
+    dataStoreMapSizeKB: 1, // will be unused, set as default
+  });
   config.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
 
   const deployL1ContractsValues =