diff --git a/.gitpod.yml b/.gitpod.yml
index d2ca82308c2625..e7157c368fae54 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/.werft/build.yaml b/.werft/build.yaml
index e59278cd24a435..bd004480bf1321 100644
--- a/.werft/build.yaml
+++ b/.werft/build.yaml
@@ -30,7 +30,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml
index 80d0f965525f4d..de6ceb804d682d 100644
--- a/.werft/run-integration-tests.yaml
+++ b/.werft/run-integration-tests.yaml
@@ -22,7 +22,7 @@ pod:
     emptyDir: {}
   initContainers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml
index 730d2f63f4d8a5..6e3afe5183972f 100644
--- a/.werft/wipe-devstaging.yaml
+++ b/.werft/wipe-devstaging.yaml
@@ -14,7 +14,7 @@ pod:
       secretName: gcp-sa-gitpod-dev-deployer
   containers:
   - name: wipe-devstaging
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/components/gitpod-protocol/go/gitpod-config_test.go b/components/gitpod-protocol/go/gitpod-config_test.go
index 82beccf126a881..21df01b54383bf 100644
--- a/components/gitpod-protocol/go/gitpod-config_test.go
+++ b/components/gitpod-protocol/go/gitpod-config_test.go
@@ -24,7 +24,7 @@ func TestGitpodConfig(t *testing.T) {
 		{
 			Desc: "parsing",
 			Content: `
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
@@ -43,7 +43,7 @@ vscode:
     - hangxingliu.vscode-nginx-conf-hint@0.1.0:UATTe2sTFfCYWQ3jw4IRsw==
     - zxh404.vscode-proto3@0.4.2:ZnPmyF/Pb8AIWeCqc83gPw==`,
 			Expectation: &GitpodConfig{
-				Image:             "eu.gcr.io/gitpod-core-dev/dev/dev-environment:pluggable-workspace-cluster.9",
+				Image:             "eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-go163.32",
 				WorkspaceLocation: "gitpod/gitpod-ws.code-workspace",
 				CheckoutLocation:  "gitpod",
 				Ports: []*PortsItems{