diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
index d9012671fa..337bcf827b 100644
--- a/cluster/config-defaults.yaml
+++ b/cluster/config-defaults.yaml
@@ -379,6 +379,11 @@ horizontal_pod_autoscaler_sync_period: "30s"
 horizontal_pod_autoscaler_tolerance: "0.1"
 horizontal_pod_downscale_stabilization: "5m0s"
 
+# Vertical pod autoscaler version for controlling roll-out, can be "current" or "legacy"
+# current => v0.11.0-internal.17
+# legacy => v0.6.1-internal.16
+vertical_pod_autoscaler_version: "current"
+
 # Cluster update settings
 {{if eq .Cluster.Environment "production"}}
 drain_grace_period: "6h"
diff --git a/cluster/manifests/01-vertical-pod-autoscaler/admission-controller-deployment.yaml b/cluster/manifests/01-vertical-pod-autoscaler/admission-controller-deployment.yaml
index 574e80d576..e12012d6c1 100644
--- a/cluster/manifests/01-vertical-pod-autoscaler/admission-controller-deployment.yaml
+++ b/cluster/manifests/01-vertical-pod-autoscaler/admission-controller-deployment.yaml
@@ -27,7 +27,11 @@ spec:
       serviceAccountName: vpa-admission-controller
       containers:
       - name: admission-controller
+        {{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
+        image: container-registry.zalando.net/teapot/vpa-admission-controller:v0.11.0-internal.17
+        {{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
         image: container-registry.zalando.net/teapot/vpa-admission-controller:v0.6.1-internal.16
+        {{end}}
         command:
           - /admission-controller
         args:
diff --git a/cluster/manifests/01-vertical-pod-autoscaler/recommender-deployment.yaml b/cluster/manifests/01-vertical-pod-autoscaler/recommender-deployment.yaml
index 9a6951f251..643a9207f5 100644
--- a/cluster/manifests/01-vertical-pod-autoscaler/recommender-deployment.yaml
+++ b/cluster/manifests/01-vertical-pod-autoscaler/recommender-deployment.yaml
@@ -25,7 +25,11 @@ spec:
       serviceAccountName: vpa-recommender
       containers:
       - name: recommender
+        {{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
+        image: container-registry.zalando.net/teapot/vpa-recommender:v0.11.0-internal.17
+        {{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
         image: container-registry.zalando.net/teapot/vpa-recommender:v0.6.1-internal.16
+        {{end}}
         args:
         - --logtostderr
         - --v=1
diff --git a/cluster/manifests/01-vertical-pod-autoscaler/updater-deployment.yaml b/cluster/manifests/01-vertical-pod-autoscaler/updater-deployment.yaml
index 3ea9173281..634cf1f3e4 100644
--- a/cluster/manifests/01-vertical-pod-autoscaler/updater-deployment.yaml
+++ b/cluster/manifests/01-vertical-pod-autoscaler/updater-deployment.yaml
@@ -25,14 +25,17 @@ spec:
       serviceAccountName: vpa-updater
       containers:
       - name: updater
+        {{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
+        image: container-registry.zalando.net/teapot/vpa-updater:v0.11.0-internal.17
+        {{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
         image: container-registry.zalando.net/teapot/vpa-updater:v0.6.1-internal.16
+        {{end}}
         command:
           - ./updater
         args:
           - --v=1
           - --logtostderr
           - --min-replicas=1
-          - --pod-lifetime-update-threshold=12h
           - --evict-after-oom-threshold=12h
         resources:
           limits: