diff --git a/cluster/manifests/etcd-backup/cronjob.yaml b/cluster/manifests/etcd-backup/cronjob.yaml
index 2a4e22b361..acadaf1ab3 100644
--- a/cluster/manifests/etcd-backup/cronjob.yaml
+++ b/cluster/manifests/etcd-backup/cronjob.yaml
@@ -31,7 +31,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: etcd-backup
-            image: container-registry.zalando.net/teapot/etcd-backup:master-15
+            image: container-registry.zalando.net/teapot/etcd-backup:master-16
             env:
             - name: ETCD_S3_BACKUP_BUCKET
               value: "{{ .ConfigItems.etcd_s3_backup_bucket }}"
diff --git a/cluster/manifests/kube-cluster-autoscaler/daemonset.yaml b/cluster/manifests/kube-cluster-autoscaler/daemonset.yaml
index daeb3c7886..9482b87678 100644
--- a/cluster/manifests/kube-cluster-autoscaler/daemonset.yaml
+++ b/cluster/manifests/kube-cluster-autoscaler/daemonset.yaml
@@ -36,7 +36,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: cluster-autoscaler
-        image: registry.opensource.zalan.do/teapot/kube-cluster-autoscaler:v1.18.2-internal.37
+        image: container-registry.zalando.net/teapot/kube-cluster-autoscaler:v1.18.2-internal.39
         command:
           - ./cluster-autoscaler
           - --v=1
diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml
index 90f3159f54..79b5cf85e1 100644
--- a/cluster/node-pools/master-default/userdata.yaml
+++ b/cluster/node-pools/master-default/userdata.yaml
@@ -243,7 +243,7 @@ write_files:
               readOnly: true
 {{- if or (eq .Cluster.ConfigItems.routegroups_validation "provisioned") (eq .Cluster.ConfigItems.routegroups_validation "enabled") }}
         - name: routegroups-admission-webhook
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.150
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.13.218
           args:
             - webhook
             - --address=:9085
@@ -410,7 +410,7 @@ write_files:
             value: {{ .Cluster.ConfigItems.apiserver_business_partner_ids }}
 {{ end }}
         - name: skipper-proxy
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.150
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.13.218
           args:
           - skipper
           - -access-log-strip-query
@@ -461,7 +461,7 @@ write_files:
             name: ssl-certs-kubernetes
             readOnly: true
         - name: skipper-metrics
-          image: registry.opensource.zalan.do/teapot/skipper:v0.13.150
+          image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.13.218
           args:
           - skipper
           - -access-log-strip-query
diff --git a/test/e2e/loadtest/client/loadtest-deployment.yaml b/test/e2e/loadtest/client/loadtest-deployment.yaml
index 8dca2af683..71c951ac36 100644
--- a/test/e2e/loadtest/client/loadtest-deployment.yaml
+++ b/test/e2e/loadtest/client/loadtest-deployment.yaml
@@ -24,7 +24,7 @@ spec:
         application: e2e-vegeta
     spec:
       containers:
-      - image: registry.opensource.zalan.do/teapot/skipper:v0.13.179
+      - image: container-registry.zalando.net/teapot/skipper:v0.13.218
         imagePullPolicy: IfNotPresent
         name: skipper
         args: