diff --git a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml
index 3ed3980..ae118d4 100644
--- a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml
+++ b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml
@@ -6,11 +6,11 @@ metadata:
 spec:
   resources:
   - content: |
-      # control-plane upgrade plan
+      # SUC Plan related to upgrading the K3s version of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: k3s-plan-control-plane
+        name: k3s-upgrade-control-plane
         namespace: cattle-system
         labels:
           k3s-upgrade: control-plane
@@ -35,16 +35,16 @@ spec:
         cordon: true
         upgrade:
           image: rancher/k3s-upgrade
-        version: v1.30.3+k3s1
+        version: v1.30.5+k3s1
       ---
-      # worker upgrade plan
+      # SUC Plan related to upgrading the K3s version of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: k3s-plan-agent
+        name: k3s-upgrade-worker
         namespace: cattle-system
         labels:
-          k3s-upgrade: agent
+          k3s-upgrade: worker
       spec:
         concurrency: 2 
         nodeSelector:
@@ -56,11 +56,11 @@ spec:
           image: rancher/k3s-upgrade
           args:
           - prepare
-          - k3s-plan-control-plane
+          - k3s-upgrade-control-plane
         cordon: true
         upgrade:
           image: rancher/k3s-upgrade
-        version: v1.30.3+k3s1
+        version: v1.30.5+k3s1
     name: k3s-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets
diff --git a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml
index 3f9d2c0..4362f75 100644
--- a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml
+++ b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml
@@ -1,20 +1,21 @@
 kind: Bundle
 apiVersion: fleet.cattle.io/v1alpha1
 metadata:
-  name: os-upgrade-310
+  name: os-upgrade
   namespace: fleet-default
 spec:
   resources:
   - content: |
+      # SUC Plan related to upgrading/migrating the operating system of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: agent-os-upgrade-edge-310
+        name: os-upgrade-worker
         namespace: cattle-system
       spec:
         concurrency: 1
         # Override default SUC set value of 900 with something that will
-        # give the enough time to the agent plan to finish 
+        # give the enough time to the worker plan to finish 
         jobActiveDeadlineSecs: 43200
         nodeSelector:
           matchExpressions:
@@ -22,10 +23,10 @@ spec:
             - {key: node-role.kubernetes.io/control-plane, operator: NotIn, values: ["true"]}
         serviceAccountName: system-upgrade-controller
         secrets:
-          - name: os-upgrade-edge-310
-            path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+          - name: os-upgrade-script
+            path: /host/run/system-upgrade/secrets/os-upgrade-script
         cordon: true
-        version: "3.1.0"
+        version: "3.1.1"
         prepare:
           image: registry.suse.com/edge/3.1/kubectl:1.30.3
           command: ["/bin/sh", "-c"]
@@ -41,7 +42,7 @@ spec:
                   if [ -n "$PLAN_APPLYING_CHECK" ]; then
                     echo "SUC has not yet cleared ${MASTER_PLAN} plan 'status.applying' list. Checking again in ${CHECK_INTERVAL} seconds..."
                   else
-                    echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to agent node upgrade.."
+                    echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to worker node upgrade.."
                     break
                   fi
                 fi
@@ -49,7 +50,7 @@ spec:
               done
           envs:
           - name: MASTER_PLAN
-            value: "cp-os-upgrade-edge-310"
+            value: "os-upgrade-control-plane"
           - name: NAMESPACE
             valueFrom:
               fieldRef:
@@ -57,15 +58,16 @@ spec:
         upgrade:
           image: registry.suse.com/bci/bci-base:15.6
           command: ["chroot", "/host"]
-          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
           envFrom:
           - configMapRef:
-              name: os-upgrade-edge-310
+              name: os-upgrade-config
       ---
+      # SUC Plan related to upgrading/migrating the operating system of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: cp-os-upgrade-edge-310
+        name: os-upgrade-control-plane
         namespace: cattle-system
       spec:
         concurrency: 1
@@ -89,22 +91,24 @@ spec:
           effect: "NoExecute"
         serviceAccountName: system-upgrade-controller
         secrets:
-          - name: os-upgrade-edge-310
-            path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+          - name: os-upgrade-script
+            path: /host/run/system-upgrade/secrets/os-upgrade-script
         cordon: true
-        version: "3.1.0"
+        version: "3.1.1"
         upgrade:
           image: registry.suse.com/bci/bci-base:15.6
           command: ["chroot", "/host"]
-          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+          args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
           envFrom:
           - configMapRef:
-              name: os-upgrade-edge-310
+              name: os-upgrade-config
       ---
+      # Secret containing the script that is used by the 
+      # SUC Plans for operating system migration/upgrade
       apiVersion: v1
       kind: Secret
       metadata:
-        name: os-upgrade-edge-310
+        name: os-upgrade-script
         namespace: cattle-system
       type: Opaque
       stringData:
@@ -199,16 +203,17 @@ spec:
 
           executeUpgrade
       ---
+      # Configurations for the operating system migration/upgrade workflow
       apiVersion: v1
       kind: ConfigMap
       metadata:
-        name: os-upgrade-edge-310
+        name: os-upgrade-config
         namespace: cattle-system
       data:
         EDGE_RELEASE_CPE: "cpe:/o:suse:sl-micro:6.0"
         SL_MICRO_ZYPPER_ID: "SL-Micro"
         SL_MICRO_VERSION: "6.0"
-    name: os-pkg-update-bundle.yaml
+    name: os-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets
   - clusterSelector: null
diff --git a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml
index c6c5a77..1e16433 100644
--- a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml
+++ b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml
@@ -6,11 +6,11 @@ metadata:
 spec:
   resources:
   - content: |
-      # control-plane upgrade plan
+      # SUC Plan related to upgrading the RKE2 version of control-plane nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: rke2-plan-control-plane
+        name: rke2-upgrade-control-plane
         namespace: cattle-system
         labels:
           rke2-upgrade: control-plane
@@ -35,16 +35,16 @@ spec:
         cordon: true
         upgrade:
           image: rancher/rke2-upgrade
-        version: v1.30.3+rke2r1
+        version: v1.30.5+rke2r1
       ---
-      # worker upgrade plan
+      # SUC Plan related to upgrading the RKE2 version of worker nodes
       apiVersion: upgrade.cattle.io/v1
       kind: Plan
       metadata:
-        name: rke2-plan-agent
+        name: rke2-upgrade-worker
         namespace: cattle-system
         labels:
-          rke2-upgrade: agent
+          rke2-upgrade: worker
       spec:
         concurrency: 2
         nodeSelector:
@@ -54,7 +54,7 @@ spec:
         prepare:
           args:
           - prepare
-          - rke2-plan-control-plane
+          - rke2-upgrade-control-plane
           image: rancher/rke2-upgrade
         serviceAccountName: system-upgrade-controller
         cordon: true
@@ -62,7 +62,7 @@ spec:
           force: true
         upgrade:
           image: rancher/rke2-upgrade
-        version: v1.30.3+rke2r1
+        version: v1.30.5+rke2r1
     name: rke2-upgrade-bundle.yaml
   targets:
   # Match nothing, user needs to specify targets
diff --git a/fleets/day2/chart-templates/metal3/fleet.yaml b/fleets/day2/chart-templates/metal3/fleet.yaml
index 392452c..af87c80 100644
--- a/fleets/day2/chart-templates/metal3/fleet.yaml
+++ b/fleets/day2/chart-templates/metal3/fleet.yaml
@@ -3,6 +3,6 @@ defaultNamespace: metal3-system
 helm:
   releaseName: metal3
   chart: "oci://registry.suse.com/edge/3.1/metal3-chart"
-  version: "0.8.1"
+  version: "0.8.3"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml
index 541b82b..fe5be1a 100644
--- a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml
+++ b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml
@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector-crd"
   chart: "neuvector-crd"
   repo: "https://charts.rancher.io"
-  version: "104.0.1+up2.7.9"
+  version: "104.0.2+up2.8.0"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/chart-templates/neuvector/neuvector-ui-extension/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-ui-extension/fleet.yaml
index de69ad6..c93d4c5 100644
--- a/fleets/day2/chart-templates/neuvector/neuvector-ui-extension/fleet.yaml
+++ b/fleets/day2/chart-templates/neuvector/neuvector-ui-extension/fleet.yaml
@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector-ui-ext"
   chart: "neuvector-ui-ext"
   repo: "https://github.com/rancher/ui-plugin-charts/raw/main/"
-  version: "1.0.0"
+  version: "2.0.0"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml
index 9f225a7..f24cddb 100644
--- a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml
+++ b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml
@@ -4,6 +4,6 @@ helm:
   releaseName: "neuvector"
   chart: "neuvector"
   repo: "https://charts.rancher.io"
-  version: "104.0.1+up2.7.9"
+  version: "104.0.2+up2.8.0"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml b/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml
index c373996..2de31fc 100644
--- a/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml
+++ b/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml
@@ -3,6 +3,6 @@ defaultNamespace: rancher-turtles-system
 helm:
   releaseName: rancher-turtles-airgap-resources
   chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-airgap-resources-chart"
-  version: "0.3.2"
+  version: "0.3.3"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/chart-templates/rancher-turtles/fleet.yaml b/fleets/day2/chart-templates/rancher-turtles/fleet.yaml
index 3240be5..c798cf3 100644
--- a/fleets/day2/chart-templates/rancher-turtles/fleet.yaml
+++ b/fleets/day2/chart-templates/rancher-turtles/fleet.yaml
@@ -3,7 +3,7 @@ defaultNamespace: rancher-turtles-system
 helm:
   releaseName: rancher-turtles
   chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-chart"
-  version: "0.3.2"
+  version: "0.3.3"
   # custom chart value overrides
   values: {}
 
diff --git a/fleets/day2/chart-templates/rancher/fleet.yaml b/fleets/day2/chart-templates/rancher/fleet.yaml
index 383d281..9670d40 100644
--- a/fleets/day2/chart-templates/rancher/fleet.yaml
+++ b/fleets/day2/chart-templates/rancher/fleet.yaml
@@ -4,6 +4,6 @@ helm:
   releaseName: "rancher"
   chart: "rancher"
   repo: "https://charts.rancher.com/server-charts/prime"
-  version: "2.9.1"
+  version: "2.9.3"
   # custom chart value overrides
   values: {}
diff --git a/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml b/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml
index cba3f87..c53d625 100644
--- a/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml
@@ -25,7 +25,7 @@ spec:
       path: /host/run/system-upgrade/secrets/migration-prep-script
   cordon: false
   # Version of the specific Edge release that this Plan relates to
-  version: "3.1.0"
+  version: "3.1.1"
   upgrade:
     image: registry.suse.com/edge/3.1/kubectl:1.30.3
     command: ["/bin/sh", "/host/run/system-upgrade/secrets/migration-prep-script/prepare_chart_migration.sh"]
diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml
index 43ddff8..1fe4e8f 100644
--- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml
@@ -1,7 +1,8 @@
+# SUC Plan related to upgrading the K3s version of control-plane nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: k3s-plan-control-plane
+  name: k3s-upgrade-control-plane
   labels:
     k3s-upgrade: control-plane
 spec:
@@ -25,4 +26,4 @@ spec:
   cordon: true
   upgrade:
     image: rancher/k3s-upgrade
-  version: v1.30.3+k3s1
+  version: v1.30.5+k3s1
diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml
similarity index 74%
rename from fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml
rename to fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml
index 2cde034..432a262 100644
--- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml
@@ -1,10 +1,10 @@
-# worker upgrade plan
+# SUC Plan related to upgrading the K3s version of worker nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: k3s-plan-agent
+  name: k3s-upgrade-worker
   labels:
-    k3s-upgrade: agent
+    k3s-upgrade: worker
 spec:
   concurrency: 2 
   nodeSelector:
@@ -16,8 +16,8 @@ spec:
     image: rancher/k3s-upgrade
     args:
     - prepare
-    - k3s-plan-control-plane
+    - k3s-upgrade-control-plane
   cordon: true
   upgrade:
     image: rancher/k3s-upgrade
-  version: v1.30.3+k3s1
+  version: v1.30.5+k3s1
diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/config-map.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/config-map.yaml
index 69341bb..6728d03 100644
--- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/config-map.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/config-map.yaml
@@ -1,7 +1,8 @@
+# Configurations for the operating system migration/upgrade workflow
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: os-upgrade-edge-310
+  name: os-upgrade-config
 data:
   EDGE_RELEASE_CPE: "cpe:/o:suse:sl-micro:6.0"
   SL_MICRO_ZYPPER_ID: "SL-Micro"
diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml
index 217ee9e..4bf0814 100644
--- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml
@@ -1,7 +1,8 @@
+# SUC Plan related to upgrading/migrating the operating system of control-plane nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: cp-os-upgrade-edge-310
+  name: os-upgrade-control-plane
 spec:
   concurrency: 1
   # Override the default SUC set value of 900 with something that will
@@ -24,14 +25,14 @@ spec:
     effect: "NoExecute"
   serviceAccountName: system-upgrade-controller
   secrets:
-    - name: os-upgrade-edge-310
-      path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+    - name: os-upgrade-script
+      path: /host/run/system-upgrade/secrets/os-upgrade-script
   cordon: true
-  version: "3.1.0"
+  version: "3.1.1"
   upgrade:
     image: registry.suse.com/bci/bci-base:15.6
     command: ["chroot", "/host"]
-    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
     envFrom:
     - configMapRef:
-        name: os-upgrade-edge-310
+        name: os-upgrade-config
diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml
similarity index 78%
rename from fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml
rename to fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml
index 034511e..511d493 100644
--- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml
@@ -1,11 +1,12 @@
+# SUC Plan related to upgrading/migrating the operating system of worker nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: agent-os-upgrade-edge-310
+  name: os-upgrade-worker
 spec:
   concurrency: 1
   # Override default SUC set value of 900 with something that will
-  # give the enough time to the agent plan to finish 
+  # give the enough time to the worker plan to finish 
   jobActiveDeadlineSecs: 43200
   nodeSelector:
     matchExpressions:
@@ -13,10 +14,10 @@ spec:
       - {key: node-role.kubernetes.io/control-plane, operator: NotIn, values: ["true"]}
   serviceAccountName: system-upgrade-controller
   secrets:
-    - name: os-upgrade-edge-310
-      path: /host/run/system-upgrade/secrets/os-upgrade-edge-310
+    - name: os-upgrade-script
+      path: /host/run/system-upgrade/secrets/os-upgrade-script
   cordon: true
-  version: "3.1.0"
+  version: "3.1.1"
   prepare:
     image: registry.suse.com/edge/3.1/kubectl:1.30.3
     command: ["/bin/sh", "-c"]
@@ -32,7 +33,7 @@ spec:
             if [ -n "$PLAN_APPLYING_CHECK" ]; then
               echo "SUC has not yet cleared ${MASTER_PLAN} plan 'status.applying' list. Checking again in ${CHECK_INTERVAL} seconds..."
             else
-              echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to agent node upgrade.."
+              echo "${MASTER_PLAN} control-plane upgrade has finished. Proceeding to worker node upgrade.."
               break
             fi
           fi
@@ -40,7 +41,7 @@ spec:
         done
     envs:
     - name: MASTER_PLAN
-      value: "cp-os-upgrade-edge-310"
+      value: "os-upgrade-control-plane"
     - name: NAMESPACE
       valueFrom:
         fieldRef:
@@ -48,7 +49,7 @@ spec:
   upgrade:
     image: registry.suse.com/bci/bci-base:15.6
     command: ["chroot", "/host"]
-    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-edge-310/upgrade.sh"]
+    args: ["sh", "/run/system-upgrade/secrets/os-upgrade-script/upgrade.sh"]
     envFrom:
     - configMapRef:
-        name: os-upgrade-edge-310
+        name: os-upgrade-config
diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/secret.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/secret.yaml
index 7d5dfea..6152e45 100644
--- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/secret.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/secret.yaml
@@ -1,7 +1,9 @@
+# Secret containing the script that is used by the 
+# SUC Plans for operating system migration/upgrade
 apiVersion: v1
 kind: Secret
 metadata:
-  name: os-upgrade-edge-310
+  name: os-upgrade-script
 type: Opaque
 stringData:
   upgrade.sh: |
diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml
index b5b57a5..495754c 100644
--- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml
@@ -1,7 +1,8 @@
+# SUC Plan related to upgrading the RKE2 version of control-plane nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: rke2-plan-control-plane
+  name: rke2-upgrade-control-plane
   labels:
     rke2-upgrade: control-plane
 spec:
@@ -25,4 +26,4 @@ spec:
   cordon: true
   upgrade:
     image: rancher/rke2-upgrade
-  version: v1.30.3+rke2r1
+  version: v1.30.5+rke2r1
diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml
similarity index 74%
rename from fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml
rename to fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml
index 1811be5..9328a56 100644
--- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml
+++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml
@@ -1,9 +1,10 @@
+# SUC Plan related to upgrading the RKE2 version of worker nodes
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
 metadata:
-  name: rke2-plan-agent
+  name: rke2-upgrade-worker
   labels:
-    rke2-upgrade: agent
+    rke2-upgrade: worker
 spec:
   concurrency: 2
   nodeSelector:
@@ -13,7 +14,7 @@ spec:
   prepare:
     args:
     - prepare
-    - rke2-plan-control-plane
+    - rke2-upgrade-control-plane
     image: rancher/rke2-upgrade
   serviceAccountName: system-upgrade-controller
   cordon: true
@@ -21,4 +22,4 @@ spec:
     force: true
   upgrade:
     image: rancher/rke2-upgrade
-  version: v1.30.3+rke2r1
+  version: v1.30.5+rke2r1
diff --git a/gitrepos/day2/k3s-upgrade-gitrepo.yaml b/gitrepos/day2/k3s-upgrade-gitrepo.yaml
index 79d4f1b..b756dc4 100644
--- a/gitrepos/day2/k3s-upgrade-gitrepo.yaml
+++ b/gitrepos/day2/k3s-upgrade-gitrepo.yaml
@@ -4,7 +4,7 @@ metadata:
   name: k3s-upgrade
   namespace: fleet-default
 spec:
-  revision: release-3.1.0
+  revision: release-3.1.1
   paths:
   - fleets/day2/system-upgrade-controller-plans/k3s-upgrade
   repo: https://github.com/suse-edge/fleet-examples.git
diff --git a/gitrepos/day2/os-update-gitrepo.yaml b/gitrepos/day2/os-upgrade-gitrepo.yaml
similarity index 92%
rename from gitrepos/day2/os-update-gitrepo.yaml
rename to gitrepos/day2/os-upgrade-gitrepo.yaml
index de8d442..d3f6349 100644
--- a/gitrepos/day2/os-update-gitrepo.yaml
+++ b/gitrepos/day2/os-upgrade-gitrepo.yaml
@@ -4,7 +4,7 @@ metadata:
   name: os-upgrade
   namespace: fleet-default
 spec:
-  revision: release-3.1.0
+  revision: release-3.1.1
   paths:
   - fleets/day2/system-upgrade-controller-plans/os-upgrade
   repo: https://github.com/suse-edge/fleet-examples.git
diff --git a/gitrepos/day2/rke2-upgrade-gitrepo.yaml b/gitrepos/day2/rke2-upgrade-gitrepo.yaml
index a1dcd93..9b18cd1 100644
--- a/gitrepos/day2/rke2-upgrade-gitrepo.yaml
+++ b/gitrepos/day2/rke2-upgrade-gitrepo.yaml
@@ -4,7 +4,7 @@ metadata:
   name: rke2-upgrade
   namespace: fleet-default
 spec:
-  revision: release-3.1.0
+  revision: release-3.1.1
   paths:
   - fleets/day2/system-upgrade-controller-plans/rke2-upgrade
   repo: https://github.com/suse-edge/fleet-examples.git
diff --git a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml
index ae5fcb5..1b3808d 100644
--- a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml
+++ b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml
@@ -4,7 +4,7 @@ metadata:
   name: system-upgrade-controller
   namespace: fleet-default
 spec:
-  revision: release-3.1.0
+  revision: release-3.1.1
   paths:
   - fleets/day2/system-upgrade-controller
   repo: https://github.com/suse-edge/fleet-examples.git
diff --git a/scripts/day2/edge-release-helm-oci-artefacts.txt b/scripts/day2/edge-release-helm-oci-artefacts.txt
index ec355e7..0dc4ea4 100644
--- a/scripts/day2/edge-release-helm-oci-artefacts.txt
+++ b/scripts/day2/edge-release-helm-oci-artefacts.txt
@@ -4,10 +4,10 @@ edge/3.1/cdi-chart:0.4.0
 edge/3.1/endpoint-copier-operator-chart:0.2.1
 edge/3.1/kubevirt-chart:0.4.0
 edge/3.1/kubevirt-dashboard-extension-chart:1.1.0
-edge/3.1/metal3-chart:0.8.1
+edge/3.1/metal3-chart:0.8.3
 edge/3.1/metallb-chart:0.14.9
 edge/3.1/sriov-crd-chart:1.3.0
 edge/3.1/sriov-network-operator-chart:1.3.0
-edge/3.1/rancher-turtles-chart:0.3.2
-edge/3.1/rancher-turtles-airgap-resources-chart:0.3.2
+edge/3.1/rancher-turtles-chart:0.3.3
+edge/3.1/rancher-turtles-airgap-resources-chart:0.3.3
 edge/3.1/upgrade-controller-chart:0.1.0 
diff --git a/scripts/day2/edge-release-images.txt b/scripts/day2/edge-release-images.txt
index e1885ed..1c2895f 100644
--- a/scripts/day2/edge-release-images.txt
+++ b/scripts/day2/edge-release-images.txt
@@ -5,18 +5,18 @@ edge/3.1/akri-onvif-discovery-handler:v0.12.20
 edge/3.1/akri-opcua-discovery-handler:v0.12.20
 edge/3.1/akri-udev-discovery-handler:v0.12.20
 edge/3.1/akri-webhook-configuration:v0.12.20
-edge/3.1/baremetal-operator:0.6.1
+edge/3.1/baremetal-operator:0.6.2
 edge/3.1/cluster-api-controller:v1.7.5
 edge/3.1/ip-address-manager:1.7.1
 edge/3.1/cluster-api-provider-metal3:v1.7.1
-edge/3.1/cluster-api-provider-rke2-bootstrap:0.7.0
-edge/3.1/cluster-api-provider-rke2-controlplane:0.7.0
+edge/3.1/cluster-api-provider-rke2-bootstrap:0.7.1
+edge/3.1/cluster-api-provider-rke2-controlplane:0.7.1
 edge/3.1/edge-image-builder:1.1.0
 edge/3.1/endpoint-copier-operator:0.2.0
 edge/3.1/frr:8.4
 edge/3.1/frr-k8s:v0.0.14
-edge/3.1/ironic:24.1.2.0
-edge/3.1/ironic-ipa-downloader:2.0.0
+edge/3.1/ironic:24.1.3.0
+edge/3.1/ironic-ipa-downloader:2.0.1
 edge/3.1/kube-rbac-proxy:v0.18.0
 edge/mariadb:10.6.15.1
 edge/3.1/metallb-controller:v0.14.8
@@ -37,4 +37,4 @@ suse/sles/15.6/virt-exportproxy:1.3.1-150600.5.9.1
 suse/sles/15.6/virt-exportserver:1.3.1-150600.5.9.1
 edge/3.1/upgrade-controller:0.1.0
 edge/3.1/kubectl:1.30.3
-edge/3.1/release-manifest:3.1.0
+edge/3.1/release-manifest:3.1.1
diff --git a/scripts/day2/edge-release-rke2-images.txt b/scripts/day2/edge-release-rke2-images.txt
index f89b481..b4711d7 100644
--- a/scripts/day2/edge-release-rke2-images.txt
+++ b/scripts/day2/edge-release-rke2-images.txt
@@ -1,6 +1,6 @@
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/sha256sum-amd64.txt
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2.linux-amd64.tar.gz
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images.linux-amd64.tar.zst
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-core.linux-amd64.tar.zst
-https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/sha256sum-amd64.txt
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/rke2.linux-amd64.tar.gz
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/rke2-images.linux-amd64.tar.zst
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst
+https://github.com/rancher/rke2/releases/download/v1.30.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst
diff --git a/scripts/day2/edge-save-oci-artefacts.sh b/scripts/day2/edge-save-oci-artefacts.sh
index ab93e27..6eaee56 100644
--- a/scripts/day2/edge-save-oci-artefacts.sh
+++ b/scripts/day2/edge-save-oci-artefacts.sh
@@ -51,9 +51,14 @@ if [[ -z "${source_registry}" ]]; then
     exit 1
 fi
 
-if [ ! -z "${source_registry}" ]; then
-    source_registry="${source_registry}/"
-fi
+case "${source_registry}" in
+    oci://*)
+        source_registry="${source_registry}/"
+        ;;
+    *)
+        source_registry="oci://${source_registry}/"
+        ;;
+esac
 
 if ! command -v "helm" &> /dev/null; then
     echo "Script requires 'helm' to load images into the target registry."
@@ -75,7 +80,7 @@ while IFS= read -r i; do
         continue
     fi
     
-    helm pull oci://${source_registry}${arrI[0]} --version ${arrI[1]} --destination ${temp_dir}
+    helm pull ${source_registry}${arrI[0]} --version ${arrI[1]} --destination ${temp_dir}
 done < "${list}"
 
 tar -czvf ${oci_archive} ${temp_dir}