diff --git a/cloudbuild-tagged.yaml b/cloudbuild-tagged.yaml
new file mode 100644
index 000000000..2c2bb082d
--- /dev/null
+++ b/cloudbuild-tagged.yaml
@@ -0,0 +1,14 @@
+steps:
+- name: 'spinnakerrelease/gradle_cache'
+  env: ["GRADLE_USER_HOME=/gradle_cache/.gradle"]
+  entrypoint: "bash"
+  args: [ "-c", "./gradlew fiat-web:installDist -x test -Prelease.version=$TAG_NAME"]
+- name: 'gcr.io/cloud-builders/docker'
+  args: ["build",
+         "-t", "gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA",
+         "-t", "gcr.io/$PROJECT_ID/$REPO_NAME:$TAG_NAME",
+         "-f", "Dockerfile.slim",
+         "."]
+images:
+- 'gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA'
+- 'gcr.io/$PROJECT_ID/$REPO_NAME:$TAG_NAME'
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index df0254de9..26682d28f 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,6 +1,6 @@
 steps:
-- name: 'java:8'
-  env: ["GRADLE_USER_HOME=cache"]
+- name: 'spinnakerrelease/gradle_cache'
+  env: ["GRADLE_USER_HOME=/gradle_cache/.gradle"]
   entrypoint: "bash"
   args: [ "-c", "./gradlew fiat-web:installDist -x test"]
 - name: 'gcr.io/cloud-builders/docker'