diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9fe6baa49414c806285419b6240a8cc69a92f4c1..c6516debd79f4439ba7c18929f2acf3b7ece2841 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -130,7 +130,7 @@ jobs:
           name: Push Images
           command: |
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
-            make push-master
+            make push-latest
 
   deploy:
     <<: *defaults
diff --git a/Makefile b/Makefile
index ed21337ab6e66a0ca87af5b754aee6b47f89f93c..b27d7ce7e40da19b61e4b5cc2d71fe733c93d76e 100644
--- a/Makefile
+++ b/Makefile
@@ -164,11 +164,13 @@ push-images:
 		fi \
 	done
 
-push-master:
+push-latest:
 	@set -e; \
 	for image_name in $(IMAGE_NAMES); do \
 		if ! echo $$image_name | grep build; then \
+			docker tag $$image_name:$(IMAGE_TAG) $$image_name:latest; \
 			docker tag $$image_name:$(IMAGE_TAG) $$image_name:master; \
+			docker push $$image_name:latest; \
 			docker push $$image_name:master; \
 		fi \
 	done
diff --git a/production/docker-compose.yaml b/production/docker-compose.yaml
index e4845df5153da135c017756235918d55ee63a543..a8f63136082a85d397abc7257056c0b3c71aefcd 100644
--- a/production/docker-compose.yaml
+++ b/production/docker-compose.yaml
@@ -5,7 +5,7 @@ networks:
 
 services:
   loki:
-    image: grafana/loki:master
+    image: grafana/loki:latest
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
@@ -13,7 +13,7 @@ services:
       - loki
 
   promtail:
-    image: grafana/promtail:master
+    image: grafana/promtail:latest
     volumes:
       - /var/log:/var/log
     command: -config.file=/etc/promtail/docker-config.yaml
diff --git a/production/helm/grafana.yaml b/production/helm/grafana.yaml
index 0614cdfd3906c640a91557b2d39536bb6dd0882f..a80753d353fb86657372ce09ab32a9d305294a8b 100644
--- a/production/helm/grafana.yaml
+++ b/production/helm/grafana.yaml
@@ -1,5 +1,5 @@
 image:
-  tag: master
+  tag: latest
 
 env:
   GF_EXPLORE_ENABLED: true
\ No newline at end of file
diff --git a/production/helm/values.yaml b/production/helm/values.yaml
index c47889d8fffbf31ad518f339f4e8f4dee763956c..f03f0508913d30d8c3c45c22a2f0162e637be5c8 100644
--- a/production/helm/values.yaml
+++ b/production/helm/values.yaml
@@ -19,7 +19,7 @@ loki:
 
   image:
     repository: grafana/loki
-    tag: master
+    tag: latest
     pullPolicy: Always # Always pull while in BETA
 
   service:
@@ -122,7 +122,7 @@ promtail:
 
   image:
     repository: grafana/promtail
-    tag: master
+    tag: latest
     pullPolicy: Always # Always pull while in BETA
 
   volumes:
diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet
index 5951737ae1a5e7177644dc2a44143dc979a68a4a..be6c37271abe587b16e2bb513bbfb7e2d32a5da3 100644
--- a/production/ksonnet/loki/images.libsonnet
+++ b/production/ksonnet/loki/images.libsonnet
@@ -7,7 +7,7 @@
     // Our services.
     tableManager: 'grafana/cortex-table-manager:r47-06f3294e',
 
-    loki: 'grafana/loki:master',
+    loki: 'grafana/loki:latest',
 
     distributor: self.loki,
     ingester: self.loki,
diff --git a/production/ksonnet/promtail/promtail.libsonnet b/production/ksonnet/promtail/promtail.libsonnet
index 4f41709d0f7a80e9a69ec793b1a15f64d8d96da1..7b2b87a7f7a85471d27009dd37fbfd3e281623a3 100644
--- a/production/ksonnet/promtail/promtail.libsonnet
+++ b/production/ksonnet/promtail/promtail.libsonnet
@@ -2,7 +2,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
 
 k {
   _images+:: {
-    promtail: 'grafana/promtail:master',
+    promtail: 'grafana/promtail:latest',
   },
 
   _config+:: {
diff --git a/tools/promtail.sh b/tools/promtail.sh
index 0a72fa9a4305c404d53043b04bc4aa08f683ea03..1fc87290c183f8ef70e99714892791bbc2045bb9 100644
--- a/tools/promtail.sh
+++ b/tools/promtail.sh
@@ -120,7 +120,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/promtail:master
+        image: grafana/promtail:latest
         imagePullPolicy: IfNotPresent
         name: promtail
         ports: