diff --git a/ansible/files/registry/images.sh b/ansible/files/registry/images.sh
index 56adbe8f1..bc7ad0514 100755
--- a/ansible/files/registry/images.sh
+++ b/ansible/files/registry/images.sh
@@ -9,7 +9,7 @@ registry_name="localhost"
 images=$(cat $SCRIPT_DIR/list_of_docker_images.txt)
 quay=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^quay.io" | awk -F quay.io/ '{print $2}' | grep -v '^$' )
 gcr=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^gcr.io" | awk -F gcr.io/ '{print $2}' | grep -v '^$')
-k8sgcr=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^k8s.gcr.io" | awk -F k8s.gcr.io/ '{print $2}' | grep -v '^$')
+registryk8s=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^registry.k8s.io" | awk -F registry.k8s.io/ '{print $2}' | grep -v '^$')
 hub=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep -v gcr.io | grep -v quay.io)
 
 
@@ -26,8 +26,8 @@ for image in ${quay[@]}; do
     mirror
 done;
 
-prefix=k8s.gcr.io/
-for image in ${k8sgcr[@]}; do
+prefix=registry.k8s.io/
+for image in ${registryk8s[@]}; do
     mirror
 done;
 
diff --git a/ansible/files/registry/list_of_docker_images.txt b/ansible/files/registry/list_of_docker_images.txt
index 28ddcb095..849ad826c 100644
--- a/ansible/files/registry/list_of_docker_images.txt
+++ b/ansible/files/registry/list_of_docker_images.txt
@@ -33,9 +33,9 @@ gcr.io/google_containers/pause-amd64:3.1
 gcr.io/kubernetes-helm/tiller:v2.11.0
 gcr.io/kubernetes-helm/tiller:v2.13.1
 grafana/grafana:5.0.0
-k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.4.0
-k8s.gcr.io/defaultbackend:1.4
-k8s.gcr.io/k8s-dns-node-cache:1.15.1
+registry.k8s.io/cluster-proportional-autoscaler-amd64:1.4.0
+registry.k8s.io/defaultbackend:1.4
+registry.k8s.io/k8s-dns-node-cache:1.15.1
 lachlanevenson/k8s-helm:v2.13.1
 localstack/localstack:0.8.7
 mesosphere/aws-cli:1.14.5
diff --git a/ansible/files/registry/mk-sub-certificate b/ansible/files/registry/mk-sub-certificate
index 1a60f37ae..021d14349 100755
--- a/ansible/files/registry/mk-sub-certificate
+++ b/ansible/files/registry/mk-sub-certificate
@@ -19,7 +19,7 @@ set -ex
 echo $cn > dns_name
 
 ALLDOMAINS=""
-for ONEREGISTRYIN in quay.io k8s.gcr.io gcr.io docker.caching.proxy.internal registry-1.docker.io auth.docker.io ${REGISTRIES}; do
+for ONEREGISTRYIN in quay.io registry.k8s.io gcr.io docker.caching.proxy.internal registry-1.docker.io auth.docker.io ${REGISTRIES}; do
     ONEREGISTRY=$(echo ${ONEREGISTRYIN} | xargs) # Remove whitespace
     echo "Adding certificate for registry: $ONEREGISTRY"
     ALLDOMAINS="${ALLDOMAINS},DNS:${ONEREGISTRY}"
diff --git a/ansible/registry.yml b/ansible/registry.yml
index 8616d3776..91646d4a1 100644
--- a/ansible/registry.yml
+++ b/ansible/registry.yml
@@ -90,7 +90,7 @@
       with_items:
         - "{{ registry_dns_name }}"
         - quay.io
-        - k8s.gcr.io
+        - registry.k8s.io
         - gcr.io
         - docker.caching.proxy.internal
         - registry-1.docker.io
diff --git a/terraform/examples/create-infrastructure.tf b/terraform/examples/create-infrastructure.tf
index 5b754d4a9..6d6d70058 100644
--- a/terraform/examples/create-infrastructure.tf
+++ b/terraform/examples/create-infrastructure.tf
@@ -21,7 +21,7 @@ resource "hcloud_server" "node" {
   count       = 3
   name        = "node${count.index}"
   image       = "ubuntu-22.04"
-  server_type = "cx41"
+  server_type = "cx42"
   ssh_keys    = ["hetznerssh-key"]
   # Nuremberg (for choices see `hcloud datacenter list`)
   location = "nbg1"
@@ -31,7 +31,7 @@ resource "hcloud_server" "etcd" {
   count       = 3
   name        = "etcd${count.index}"
   image       = "ubuntu-22.04"
-  server_type = "cx41"
+  server_type = "cx42"
   ssh_keys    = ["hetznerssh-key"]
 
   # Nuremberg (for choices see `hcloud datacenter list`)
diff --git a/terraform/examples/wire-server-deploy-offline-hetzner/main.tf b/terraform/examples/wire-server-deploy-offline-hetzner/main.tf
index a01332e42..30553a8ff 100644
--- a/terraform/examples/wire-server-deploy-offline-hetzner/main.tf
+++ b/terraform/examples/wire-server-deploy-offline-hetzner/main.tf
@@ -63,7 +63,7 @@ resource "hcloud_server" "adminhost" {
   name        = "adminhost-${random_pet.adminhost.id}"
   image       = "ubuntu-22.04"
   ssh_keys    = local.ssh_keys
-  server_type = "cx41"
+  server_type = "cx42"
   user_data   = <<-EOF
   #cloud-config
   apt:
@@ -98,7 +98,7 @@ resource "hcloud_server" "assethost" {
   name        = "assethost-${random_pet.assethost.id}"
   image       = "ubuntu-22.04"
   ssh_keys    = local.ssh_keys
-  server_type = "cx41"
+  server_type = "cx42"
   user_data   = local.disable_network_cfg
 }
 
@@ -139,7 +139,7 @@ resource "hcloud_server" "kubenode" {
   name        = "kubenode-${random_pet.kubenode[count.index].id}"
   image       = "ubuntu-22.04"
   ssh_keys    = local.ssh_keys
-  server_type = "cx41"
+  server_type = "cx42"
   user_data   = local.disable_network_cfg
 }