diff --git a/infrastructure/system-upgrades/fedora-temperature-management.yaml b/infrastructure/system-upgrades/fedora-temperature-management.yaml
index d97ce71191ec74ee00bc841dc055ef47d8c70b92..ca3b8eb8519e607c1fd877255aa4220360c97430 100644
--- a/infrastructure/system-upgrades/fedora-temperature-management.yaml
+++ b/infrastructure/system-upgrades/fedora-temperature-management.yaml
@@ -56,6 +56,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
   serviceAccountName: system-upgrade
   secrets:
     - name: fedora-install-temperature-management
diff --git a/infrastructure/system-upgrades/fedora.yaml b/infrastructure/system-upgrades/fedora.yaml
index 1be5656ca9cb9e3b3afff66685f8436501e1529e..4c644afc20a07d3324abfd5cf6857a03fba6a206 100644
--- a/infrastructure/system-upgrades/fedora.yaml
+++ b/infrastructure/system-upgrades/fedora.yaml
@@ -34,6 +34,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
   serviceAccountName: system-upgrade
   secrets:
     - name: fedora-dnf-upgrade
diff --git a/infrastructure/system-upgrades/kubelet.yaml b/infrastructure/system-upgrades/kubelet.yaml
index 7bf26b8d9b58f2bd9103a7c2cd79afc9bc11014b..7e8969e7259f133ce7c215be4eb0eadfb97f132d 100644
--- a/infrastructure/system-upgrades/kubelet.yaml
+++ b/infrastructure/system-upgrades/kubelet.yaml
@@ -36,6 +36,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
   serviceAccountName: system-upgrade
   drain:
     deleteLocalData: true
diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml
index 91bad27fb4586dfc353c4b68d36c562f2eac4fdd..f6fa3f37a07695f1faff39b407d8c06525a471e7 100644
--- a/infrastructure/system-upgrades/kubernetes.yaml
+++ b/infrastructure/system-upgrades/kubernetes.yaml
@@ -69,6 +69,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
       - key: node-role.kubernetes.io/control-plane
         operator: Exists
   serviceAccountName: system-upgrade
diff --git a/infrastructure/system-upgrades/logrotate.yaml b/infrastructure/system-upgrades/logrotate.yaml
index 40bd69e8029901c6e4f83e14a38374fedcbc6e9f..918351a3dcd437ec2a7dbcb7df0e3113d7d3e580 100644
--- a/infrastructure/system-upgrades/logrotate.yaml
+++ b/infrastructure/system-upgrades/logrotate.yaml
@@ -46,6 +46,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
   serviceAccountName: system-upgrade
   secrets:
     - name: logrotate-setup
diff --git a/infrastructure/system-upgrades/longhorn-setup.yaml b/infrastructure/system-upgrades/longhorn-setup.yaml
index 6bea922129bbe44494325d724baa57e1a7dae66e..148f77e65bf9317e16d53c201f0b89b31074ad3d 100644
--- a/infrastructure/system-upgrades/longhorn-setup.yaml
+++ b/infrastructure/system-upgrades/longhorn-setup.yaml
@@ -33,6 +33,7 @@ spec:
         operator: In
         values:
           - "35"
+          - "36"
   serviceAccountName: system-upgrade
   secrets:
     - name: longhorn-setup