diff --git a/.gitpod.yml b/.gitpod.yml
index be77a0efcfe5f6..7a5e69bcf399d0 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/.werft/aks-installer-tests.yaml b/.werft/aks-installer-tests.yaml
index 8f53bfeb719988..e3f7bbee5e3d24 100644
--- a/.werft/aks-installer-tests.yaml
+++ b/.werft/aks-installer-tests.yaml
@@ -65,7 +65,7 @@ pod:
       secretName: self-hosted-github-oauth
   containers:
   - name: nightly-test
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/build.yaml b/.werft/build.yaml
index 6cd1aa8a1d5bc6..71c9de69e77084 100644
--- a/.werft/build.yaml
+++ b/.werft/build.yaml
@@ -70,7 +70,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/.werft/cleanup-installer-tests.yaml b/.werft/cleanup-installer-tests.yaml
index 557d60ff292079..964c9267b193d4 100644
--- a/.werft/cleanup-installer-tests.yaml
+++ b/.werft/cleanup-installer-tests.yaml
@@ -25,7 +25,7 @@ pod:
       secretName: aks-credentials
   containers:
   - name: nightly-test
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/debug.yaml b/.werft/debug.yaml
index 14ad10a54a9325..a048fb86e46613 100644
--- a/.werft/debug.yaml
+++ b/.werft/debug.yaml
@@ -54,7 +54,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/eks-installer-tests.yaml b/.werft/eks-installer-tests.yaml
index 107be33155e27c..c2f0c5da856aeb 100644
--- a/.werft/eks-installer-tests.yaml
+++ b/.werft/eks-installer-tests.yaml
@@ -65,7 +65,7 @@ pod:
       secretName: self-hosted-github-oauth
   containers:
   - name: nightly-test
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/gke-installer-tests.yaml b/.werft/gke-installer-tests.yaml
index e4adfb7b4dbb47..75d79e00fbd40d 100644
--- a/.werft/gke-installer-tests.yaml
+++ b/.werft/gke-installer-tests.yaml
@@ -65,7 +65,7 @@ pod:
         secretName: self-hosted-github-oauth
   containers:
     - name: nightly-test
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: Always
       volumeMounts:
diff --git a/.werft/ide-integration-tests-startup.yaml b/.werft/ide-integration-tests-startup.yaml
index c181b12784373b..ba205e4c6a3cad 100644
--- a/.werft/ide-integration-tests-startup.yaml
+++ b/.werft/ide-integration-tests-startup.yaml
@@ -17,7 +17,7 @@ pod:
         secretName: github-token-gitpod-bot
   containers:
     - name: gcloud
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       env:
diff --git a/.werft/k3s-installer-tests.yaml b/.werft/k3s-installer-tests.yaml
index f135b9bf643ec9..368b0372eae4f0 100644
--- a/.werft/k3s-installer-tests.yaml
+++ b/.werft/k3s-installer-tests.yaml
@@ -65,7 +65,7 @@ pod:
       secretName: self-hosted-github-oauth
   containers:
   - name: nightly-test
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/platform-delete-preview-environment.yaml b/.werft/platform-delete-preview-environment.yaml
index 69c556cd130c7d..5b8a966964b76f 100644
--- a/.werft/platform-delete-preview-environment.yaml
+++ b/.werft/platform-delete-preview-environment.yaml
@@ -25,7 +25,7 @@ pod:
         secretName: harvester-vm-ssh-keys
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml
index 076b60e3c40578..29373d3d91231f 100644
--- a/.werft/platform-delete-preview-environments-cron.yaml
+++ b/.werft/platform-delete-preview-environments-cron.yaml
@@ -29,7 +29,7 @@ pod:
         secretName: github-token-gitpod-bot
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/.werft/platform-trigger-artificial-job.yaml b/.werft/platform-trigger-artificial-job.yaml
index 214339cd82e6db..7f169636ecd189 100644
--- a/.werft/platform-trigger-artificial-job.yaml
+++ b/.werft/platform-trigger-artificial-job.yaml
@@ -24,7 +24,7 @@ pod:
         secretName: github-token-gitpod-bot
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml
index 17f6d9eed139d8..471b76c2faf4a1 100644
--- a/.werft/platform-trigger-werft-cleanup.yaml
+++ b/.werft/platform-trigger-werft-cleanup.yaml
@@ -22,7 +22,7 @@ pod:
         secretName: gcp-sa-gitpod-dev-deployer
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml
index c1533a1d2c727c..bc7136adb057cc 100644
--- a/.werft/workspace-run-integration-tests.yaml
+++ b/.werft/workspace-run-integration-tests.yaml
@@ -22,7 +22,7 @@ pod:
         secretName: github-token-gitpod-bot
   containers:
     - name: gcloud
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-dev-install-tmux-tmuxinator.3
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.5.2.0
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       env:
diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile
index db328a7306222e..6bf5151a0a93fe 100644
--- a/dev/image/Dockerfile
+++ b/dev/image/Dockerfile
@@ -58,7 +58,7 @@ RUN cd /usr/bin && curl -fsSL https://github.com/praetorian-inc/gokart/releases/
 
 # leeway
 ENV LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE=8388608
-RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v0.5.1/leeway_0.5.1_Linux_x86_64.tar.gz | tar xz
+RUN cd /usr/bin && curl -fsSL https://github.com/gitpod-io/leeway/releases/download/v0.5.2/leeway_0.5.2_Linux_x86_64.tar.gz | tar xz
 
 # evans (gRPC client)
 RUN cd /usr/bin && curl -fsSL https://github.com/ktr0731/evans/releases/download/v0.10.6/evans_linux_amd64.tar.gz | tar xz evans