diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18655765e8e6f..b476b3d8f2ccf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,7 @@ workflows:
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 .defaults: &defaults
   docker:
-    - image: grafana/loki-build-image:0.19.0
+    - image: grafana/loki-build-image:0.23.0
   working_directory: /src/loki
 
 jobs:
diff --git a/.drone/drone.yml b/.drone/drone.yml
index 523c69dfd6d96..ddc1aad182217 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -53,14 +53,14 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: check-drone-drift
 - commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: check-generated-files
 - commands:
   - cd ..
@@ -69,7 +69,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: clone-main
 - commands:
   - make BUILD_IN_CONTAINER=false test
@@ -77,7 +77,7 @@ steps:
   - clone
   - clone-main
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: test
 - commands:
   - cd ../loki-main
@@ -85,7 +85,7 @@ steps:
   depends_on:
   - clone-main
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: test-main
 - commands:
   - make BUILD_IN_CONTAINER=false compare-coverage old=../loki-main/test_results.txt
@@ -95,7 +95,7 @@ steps:
   - test
   - test-main
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: compare-coverage
 - commands:
   - pull=$(echo $CI_COMMIT_REF | awk -F '/' '{print $3}')
@@ -108,7 +108,7 @@ steps:
     TOKEN:
       from_secret: github_token
     USER: grafanabot
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: report-coverage
 - commands:
   - make BUILD_IN_CONTAINER=false lint
@@ -116,7 +116,7 @@ steps:
   - clone
   - check-generated-files
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: lint
 - commands:
   - make BUILD_IN_CONTAINER=false check-mod
@@ -125,7 +125,7 @@ steps:
   - test
   - lint
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: check-mod
 - commands:
   - apk add make bash && make lint-scripts
@@ -137,21 +137,21 @@ steps:
   - clone
   - check-generated-files
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: loki
 - commands:
   - make BUILD_IN_CONTAINER=false validate-example-configs
   depends_on:
   - loki
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: validate-example-configs
 - commands:
   - make BUILD_IN_CONTAINER=false check-example-config-doc
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: check-example-config-doc
 trigger:
   ref:
@@ -178,7 +178,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: loki-mixin-check
 trigger:
   ref:
@@ -1203,7 +1203,7 @@ steps:
     NFPM_SIGNING_KEY:
       from_secret: gpg_private_key
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: write-key
 - commands:
   - make BUILD_IN_CONTAINER=false packages
@@ -1211,7 +1211,7 @@ steps:
     NFPM_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: test packaging
 - commands:
   - ./tools/packaging/verify-deb-install.sh
@@ -1237,7 +1237,7 @@ steps:
     NFPM_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.22.0
+  image: grafana/loki-build-image:0.23.0
   name: publish
   when:
     event:
@@ -1476,6 +1476,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 9e3701b6afa8c4e68e38d80a7cafce70cd74ca36addd3222bdd527bdf3d27844
+hmac: f97eb90ab5198649edd375255530188042f0b35172ce589e51362f5a5fef20ca
 
 ...
diff --git a/Makefile b/Makefile
index ae66bfbe742ae..705f5ab9141b2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
 BUILD_IN_CONTAINER ?= true
 
 # ensure you run `make drone` after changing this
-BUILD_IMAGE_VERSION := 0.22.0
+BUILD_IMAGE_VERSION := 0.23.0
 
 # Docker image info
 IMAGE_PREFIX ?= grafana
@@ -256,7 +256,7 @@ publish: packages
 ########
 
 # To run this efficiently on your workstation, run this from the root dir:
-# docker run --rm --tty -i -v $(pwd)/.cache:/go/cache -v $(pwd)/.pkg:/go/pkg -v $(pwd):/src/loki grafana/loki-build-image:0.22.0 lint
+# docker run --rm --tty -i -v $(pwd)/.cache:/go/cache -v $(pwd)/.pkg:/go/pkg -v $(pwd):/src/loki grafana/loki-build-image:0.23.0 lint
 lint:
 	GO111MODULE=on golangci-lint run -v
 	faillint -paths "sync/atomic=go.uber.org/atomic" ./...