diff --git a/clusters/k8s01/system-upgrades/dns.yaml b/clusters/k8s01/system-upgrades/dns.yaml
index 9fdfa946d28477b8a46357ee7e7102f6b0c7bb04..cacbbef07a03b58c3169cfe5b7452a8ae6e8476a 100644
--- a/clusters/k8s01/system-upgrades/dns.yaml
+++ b/clusters/k8s01/system-upgrades/dns.yaml
@@ -84,7 +84,7 @@ spec:
         force: false
     version: 1.0.0
     upgrade:
-        image: quay.io/fedora/fedora:37
+        image: quay.io/fedora/fedora:38
         command:
             - chroot
             - /host
diff --git a/clusters/k8s01/system-upgrades/iscsid_hotfix.yaml b/clusters/k8s01/system-upgrades/iscsid_hotfix.yaml
index 1001c7d0ac28e0e847ad127ceca6dd75813918b4..1723e50a29f35af11d0311072595b8332a128295 100644
--- a/clusters/k8s01/system-upgrades/iscsid_hotfix.yaml
+++ b/clusters/k8s01/system-upgrades/iscsid_hotfix.yaml
@@ -57,7 +57,7 @@ spec:
       path: /host/run/system-upgrade/secrets/fedora
   version: 1.0.0
   upgrade:
-    image: quay.io/fedora/fedora:36
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/fedora/install.sh"]
 
diff --git a/clusters/k8s01/system-upgrades/registry.yaml b/clusters/k8s01/system-upgrades/registry.yaml
index 0f804575a1ecd2f549459465317baaf09ab40d94..e30bae257f9e5573819828cfe49f55834aa53a76 100644
--- a/clusters/k8s01/system-upgrades/registry.yaml
+++ b/clusters/k8s01/system-upgrades/registry.yaml
@@ -79,7 +79,7 @@ spec:
           path: /host/run/system-upgrade/secrets/crio-registry-config
     version: 1.0.5
     upgrade:
-        image: quay.io/fedora/fedora:37
+        image: quay.io/fedora/fedora:38
         command:
             - chroot
             - /host
diff --git a/infrastructure/system-upgrades/disable-syslog.yaml b/infrastructure/system-upgrades/disable-syslog.yaml
index 41c3b429f0e28c8c803006df899e51a9fb13d58b..283675d6776959431e7d40d22e6f826de5a8a4ac 100644
--- a/infrastructure/system-upgrades/disable-syslog.yaml
+++ b/infrastructure/system-upgrades/disable-syslog.yaml
@@ -38,6 +38,6 @@ spec:
       path: /host/run/system-upgrade/secrets/disable-syslog
   version: "1.0.0"
   upgrade:
-    image: docker.io/library/fedora:35
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/disable-syslog/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/fedora-system-upgrade.yaml b/infrastructure/system-upgrades/fedora-system-upgrade.yaml
index 8c932bc2cb0bb5a8bd161e7f2cae449502efbc31..ba0e96e79c0de12a9c2ea04264122dae8ea9885d 100644
--- a/infrastructure/system-upgrades/fedora-system-upgrade.yaml
+++ b/infrastructure/system-upgrades/fedora-system-upgrade.yaml
@@ -49,6 +49,6 @@ spec:
     force: false
   version: "38"
   upgrade:
-    image: registry.fedoraproject.org/fedora:36
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/fedora/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/fedora.yaml b/infrastructure/system-upgrades/fedora.yaml
index 942008c8a51576b817501a130a7214ee603d0fa2..dd2b11c0d4a5503f4188a96f14d8dafa57c12380 100644
--- a/infrastructure/system-upgrades/fedora.yaml
+++ b/infrastructure/system-upgrades/fedora.yaml
@@ -42,6 +42,6 @@ spec:
       path: /host/run/system-upgrade/secrets/fedora
   channel: http://calver/weekly
   upgrade:
-    image: quay.io/fedora/fedora:36
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/fedora/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/kubelet.yaml b/infrastructure/system-upgrades/kubelet.yaml
index 9ac28d5185dac6d801fb95a0014009bd2c3b6f71..5c580c3ac3c4ae794c1fc44f17fc6400356b8c23 100644
--- a/infrastructure/system-upgrades/kubelet.yaml
+++ b/infrastructure/system-upgrades/kubelet.yaml
@@ -47,6 +47,6 @@ spec:
       path: /host/run/system-upgrade/secrets/kubelet
   version: "1.0.0"
   upgrade:
-    image: quay.io/fedora/fedora:36
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/kubelet/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml
index 59148f9590f6d6a1038de1da45553a490f5e8f83..b52773f6b0c2d4d541352acea42b49c7e5e661ff 100644
--- a/infrastructure/system-upgrades/kubernetes.yaml
+++ b/infrastructure/system-upgrades/kubernetes.yaml
@@ -95,5 +95,5 @@ spec:
     force: false
   version: "1.27.6"
   upgrade:
-    image: docker.io/library/fedora:38
+    image: quay.io/fedora/fedora:38
     command: ["sh", "/host/run/system-upgrade/secrets/kubernetes-upgrade/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/logrotate.yaml b/infrastructure/system-upgrades/logrotate.yaml
index f311a5eb64a1a98f75697a9ec0fe9196759abeb1..5ca6da495b61915f8ec33223cbe0447f1f9bed02 100644
--- a/infrastructure/system-upgrades/logrotate.yaml
+++ b/infrastructure/system-upgrades/logrotate.yaml
@@ -54,6 +54,6 @@ spec:
       path: /host/run/system-upgrade/secrets/logrotate-setup
   version: "1.0.0"
   upgrade:
-    image: docker.io/library/fedora:35
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/logrotate-setup/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/longhorn-lvm.yaml b/infrastructure/system-upgrades/longhorn-lvm.yaml
index 689930773d5492cbd1a12cbe567d4ffaf7e8107d..35b14c51d5db7862ce138f2cad78738d2675af48 100644
--- a/infrastructure/system-upgrades/longhorn-lvm.yaml
+++ b/infrastructure/system-upgrades/longhorn-lvm.yaml
@@ -81,6 +81,6 @@ spec:
       path: /host/run/system-upgrade/secrets/longhorn-lvm
   version: "1.0.8"
   upgrade:
-    image: docker.io/library/fedora:35
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/longhorn-lvm/upgrade.sh"]
diff --git a/infrastructure/system-upgrades/longhorn-setup.yaml b/infrastructure/system-upgrades/longhorn-setup.yaml
index 9ee9d44ce8d8b4290610c61fe22eb5d885519c25..9bb76c163919c4feb415ad65cb58f0f7952d6e3d 100644
--- a/infrastructure/system-upgrades/longhorn-setup.yaml
+++ b/infrastructure/system-upgrades/longhorn-setup.yaml
@@ -40,6 +40,6 @@ spec:
       path: /host/run/system-upgrade/secrets/longhorn-setup
   version: "1.0.0"
   upgrade:
-    image: docker.io/library/fedora:35
+    image: quay.io/fedora/fedora:38
     command: ["chroot", "/host"]
     args: ["sh", "/run/system-upgrade/secrets/longhorn-setup/upgrade.sh"]