diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
index 9045f011..9404a061 100644
--- a/.buildkite/hooks/pre-exit
+++ b/.buildkite/hooks/pre-exit
@@ -14,13 +14,5 @@ if [[ ( "$BUILDKITE_PIPELINE_SLUG" == "golang-crossbuild" || "$BUILDKITE_PIPELIN
     docker logout "${DOCKER_REGISTRY}"
 fi
 
-#if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && "$BUILDKITE_STEP_KEY" =~ ^build ]]; then
-#    google_cloud_logout_active_account
-#fi
-#
-#if [[ "$BUILDKITE_PIPELINE_SLUG" == "llvm-apple" && ("$BUILDKITE_STEP_KEY" =~ ^build || "$BUILDKITE_STEP_KEY" =~ ^publish) ]]; then
-#    docker logout "${DOCKER_REGISTRY}"
-#fi
-
 # Ensure that any temporal files created during any step are removed
 cleanup
diff --git a/README.md b/README.md
index 1852a3ea..86dad1d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
-[![Build Status](https://beats-ci.elastic.co/buildStatus/icon?job=golang-crossbuild%2Fgolang-crossbuild-mbp%2Fmain)](https://beats-ci.elastic.co/job/golang-crossbuild/job/golang-crossbuild-mbp/job/main/)
+|                   | main | 1.20 |
+|-------------------|------|-|
+| golang-crossbuild |[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=main)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=main)|[![Build status](https://badge.buildkite.com/a62e956ff483d20043847488a8797382db305653ea9fac86b2.svg?branch=1.20)](https://buildkite.com/elastic/golang-crossbuild/builds?branch=1.20)|
+| llvm-apple        |[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=main)](https://buildkite.com/elastic/llvm-apple/builds?branch=main)|[![Build status](https://badge.buildkite.com/608fe26d86b5da77dad646eec77944c306e5ad3a427c88dcf5.svg?branch=1.20)](https://buildkite.com/elastic/llvm-apple/builds?branch=1.20)|
+| fpm               |[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=main)](https://buildkite.com/elastic/fpm/builds?branch=main)|[![Build status](https://badge.buildkite.com/86216c62729e32e235059e42d58bfb54901c20bf3394c704f3.svg?branch=1.20)](https://buildkite.com/elastic/fpm/builds?branch=1.20)|
+
 
 # golang-crossbuild Docker images