diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index c3e49c6c..4346f800 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,12 +1,16 @@
 steps:
-- name: 'docker/compose:1.19.0'
-  args: ['up', '-d']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['tag', 'mapknitter-dev:latest', 'gcr.io/public-lab/mapknitter-dev']
-# Push it to GCR.
+  args: ['build',
+         '-t', 'gcr.io/public-lab/github.com/publiclab/mapknitter:$SHORT_SHA',
+         '-t', 'gcr.io/public-lab/github.com/publiclab/mapknitter:latest',
+         '-f', 'production',
+         '.']
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['push', 'gcr.io/$PROJECT_ID/mapknitter-dev']
+  args: ['push', 'gcr.io/public-lab/github.com/publiclab/mapknitter']
+- name: gcr.io/cloud-builders/gsutil
+  args: ['cp', 'gs://mapknitter-production-config/app.yaml', 'app.yaml']
 - name: 'gcr.io/cloud-builders/gcloud'
-  args: ['app', 'deploy', 'app.yaml', '--image-url=gcr.io/$PROJECT_ID/mapknitter-dev']
-images: ['gcr.io/$PROJECT_ID/mapknitter-dev']
+  args: ['app', 'deploy', 'app.yaml', '--image-url=gcr.io/public-lab/github.com/publiclab/mapknitter:latest']
+images: ['gcr.io/public-lab/github.com/publiclab/mapknitter']
 timeout: 2200s
+