diff --git a/docker/Dockerfile.heavy b/docker/Dockerfile.heavy
index 2a9fc742d..a9ea40ff5 100644
--- a/docker/Dockerfile.heavy
+++ b/docker/Dockerfile.heavy
@@ -13,7 +13,8 @@ RUN go mod download
 
 # Copy source and build
 COPY . .
-RUN make build
+ARG GO_BUILD_TAGS=goolm,stdjson,bedrock
+RUN make build GO_BUILD_TAGS=${GO_BUILD_TAGS}
 
 # ============================================================
 # Stage 2: Node.js runtime with Python + MCP support
diff --git a/infrastructure/index.ts b/infrastructure/index.ts
index 42cc0feb7..abb92dd38 100644
--- a/infrastructure/index.ts
+++ b/infrastructure/index.ts
@@ -125,7 +125,7 @@ const gatewayService = new gcp.cloudrunv2.Service("picoclaw-gateway", {
                         cpu: "1",
                         memory: "512Mi",
                     },
-                    cpuIdle: false,
+                    cpuIdle: true,
                 },
                 // startupProbe: {
                 //     httpGet: {
diff --git a/pipeline/pipeline.yaml b/pipeline/pipeline.yaml
index 523049cde..f82105323 100644
--- a/pipeline/pipeline.yaml
+++ b/pipeline/pipeline.yaml
@@ -29,7 +29,7 @@ stages:
         gcloud auth configure-docker $(Registry) --quiet
       displayName: Configure Docker for GCR
     - script: |
-        docker build -t $(Registry)/$(DockerImageName):latest -f docker/Dockerfile.launcher --build-arg GO_BUILD_TAGS=goolm,stdjson,bedrock .
+        docker build -t $(Registry)/$(DockerImageName):latest -f docker/Dockerfile.heavy --build-arg GO_BUILD_TAGS=goolm,stdjson,bedrock .
       displayName: Build docker image
     - script: |
         docker push $(Registry)/$(DockerImageName):latest