diff --git a/packages/content-fetch-go/Dockerfile b/packages/content-fetch-go/Dockerfile
index 20d08d4e6..8e5505cba 100644
--- a/packages/content-fetch-go/Dockerfile
+++ b/packages/content-fetch-go/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine AS build
+FROM golang:1.25-alpine AS build
 LABEL org.opencontainers.image.source="https://github.com/omnivore-app/omnivore"
 
 RUN apk add --no-cache git ca-certificates
diff --git a/self-hosting/docker-compose/.env.example b/self-hosting/docker-compose/.env.example
index 0ee353134..e83d05077 100644
--- a/self-hosting/docker-compose/.env.example
+++ b/self-hosting/docker-compose/.env.example
@@ -63,11 +63,18 @@ HIGHLIGHTS_BASE_URL=http://localhost:3000 # Front End - Need to change this when
 
 VERIFICATION_TOKEN=some_token
 REST_BACKEND_ENDPOINT=http://api:8080/api
-SKIP_UPLOAD_ORIGINAL=true
 
-# Minio
+# Object storage for original fetched content.
+# Uses MinIO (already running in this compose stack) via the S3-compatible API.
+# For AWS S3: BLOB_STORAGE_URL=s3://omnivore?region=us-east-1
+# For GCS:    BLOB_STORAGE_URL=gs://omnivore
+BLOB_STORAGE_URL=s3://omnivore?endpoint=http%3A%2F%2Fminio%3A9000&use_path_style=true&disable_https=true&region=us-east-1
+
+# MinIO / S3 credentials (used by content-fetch-go and the API)
 MINIO_ACCESS_KEY=minio
 MINIO_SECRET_KEY=miniominio
+AWS_ACCESS_KEY_ID=minio
+AWS_SECRET_ACCESS_KEY=miniominio
 AWS_S3_ENDPOINT_URL=http://minio:9000
 
 # Export
diff --git a/self-hosting/docker-compose/docker-compose.yml b/self-hosting/docker-compose/docker-compose.yml
index 5ffb9eab7..66ef8d5a1 100644
--- a/self-hosting/docker-compose/docker-compose.yml
+++ b/self-hosting/docker-compose/docker-compose.yml
@@ -73,12 +73,10 @@ services:
       - .env
 
   content-fetch:
-    image: "ghcr.io/omnivore-app/sh-content-fetch:latest"
+    image: "ghcr.io/omnivore-app/sh-content-fetch-go:latest"
     container_name: "omnivore-content-fetch"
     ports:
       - "9090:8080"
-    environment:
-      - USE_FIREFOX=true # Using Firefox here because the official chrome version seems to freeze a lot in Docker.
     env_file:
       - .env
     depends_on:
@@ -86,6 +84,8 @@ services:
         condition: service_healthy
       api:
         condition: service_healthy
+      createbuckets:
+        condition: service_completed_successfully
 
   redis:
     image: "redis:7.2.4"
diff --git a/self-hosting/docker-compose/self-build/docker-compose.yml b/self-hosting/docker-compose/self-build/docker-compose.yml
index 81637aa71..62b0cb6f5 100644
--- a/self-hosting/docker-compose/self-build/docker-compose.yml
+++ b/self-hosting/docker-compose/self-build/docker-compose.yml
@@ -92,13 +92,11 @@ services:
 
   content-fetch:
     build:
-      context: ../../../
-      dockerfile: ./packages/content-fetch/Dockerfile
+      context: ../../../packages/content-fetch-go
+      dockerfile: ./Dockerfile
     container_name: "omnivore-content-fetch"
     ports:
       - "9090:8080"
-    environment:
-      - USE_FIREFOX=true # Using Firefox here because the official chrome version seems to freeze a lot in Docker.
     env_file:
       - .env
     depends_on:
@@ -106,6 +104,8 @@ services:
         condition: service_healthy
       api:
         condition: service_healthy
+      createbuckets:
+        condition: service_completed_successfully
 
   redis:
     image: "redis:7.2.4"