diff --git a/cluster/manifests/fabric-gateway/deployment.yaml b/cluster/manifests/fabric-gateway/deployment.yaml
index 1d0843067d..a6c20698a3 100644
--- a/cluster/manifests/fabric-gateway/deployment.yaml
+++ b/cluster/manifests/fabric-gateway/deployment.yaml
@@ -1,4 +1,4 @@
-# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-293" }}
+# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-296" }}
 # {{ $version := index (split $image ":") 1 }}
 apiVersion: apps/v1
 kind: Deployment
diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
index 54a572fc51..4840a4119e 100644
--- a/cluster/manifests/skipper/deployment.yaml
+++ b/cluster/manifests/skipper/deployment.yaml
@@ -1,7 +1,7 @@
 {{/* image-updater-bot detects *image variables so use print to disable it for main image */}}
 
 {{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.240-1063" }}
-{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.240-1063" }}
+{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.247-1070" }}
 
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
diff --git a/cluster/node-pools/master-default/stack.yaml b/cluster/node-pools/master-default/stack.yaml
index 53522460e6..f0ee7570b5 100644
--- a/cluster/node-pools/master-default/stack.yaml
+++ b/cluster/node-pools/master-default/stack.yaml
@@ -81,7 +81,7 @@ Resources:
             VolumeType: gp3
         NetworkInterfaces:
         - DeviceIndex: 0
-          # {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
+          # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
           AssociatePublicIpAddress: true
           # {{ end }}
           Groups:
diff --git a/cluster/node-pools/worker-karpenter/provisioners.yaml b/cluster/node-pools/worker-karpenter/provisioners.yaml
index 9d1f85bf58..cc5e244632 100644
--- a/cluster/node-pools/worker-karpenter/provisioners.yaml
+++ b/cluster/node-pools/worker-karpenter/provisioners.yaml
@@ -21,7 +21,7 @@ spec:
   securityGroupSelectorTerms:
     - tags:
         karpenter.sh/discovery: "{{ .Cluster.ID }}/WorkerNodeSecurityGroup"
-  # {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
+  # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
   associatePublicIPAddress: true
   # {{ end }}
   instanceProfile: "{{ .Cluster.ID | awsValidID }}-WorkerKarpenter-InstanceProfile"
diff --git a/cluster/node-pools/worker-splitaz/stack.yaml b/cluster/node-pools/worker-splitaz/stack.yaml
index 40996e5ca8..d41a526ef6 100644
--- a/cluster/node-pools/worker-splitaz/stack.yaml
+++ b/cluster/node-pools/worker-splitaz/stack.yaml
@@ -155,7 +155,7 @@ Resources:
             VolumeType: gp3
         NetworkInterfaces:
         - DeviceIndex: 0
-          # {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
+          # {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
           AssociatePublicIpAddress: true
           # {{ end }}
           Groups: