diff --git a/Changes.md b/Changes.md
index 71afbb6b..4e3ade05 100644
--- a/Changes.md
+++ b/Changes.md
@@ -90,3 +90,9 @@
 * Use AAP 2.7 by default
 * Unpin utility container
 * Update to 0.5.* of edge-gitops-vms
+
+## Changes for v2.1 (August 2026)
+
+* Update to v0.3.* of ODF which supports Azure and GCP
+* Update some now-redundant overrides to keep up with released charts
+* Update Makefile-common, pattern.sh, and tests to work with new CI systems
diff --git a/overrides/values-egv-vms.yaml b/overrides/values-egv-vms.yaml
index d0ae1ae9..74fe9b60 100644
--- a/overrides/values-egv-vms.yaml
+++ b/overrides/values-egv-vms.yaml
@@ -1,6 +1,4 @@
 ---
-waitForMetalNode: false
-
 vmNamespace: edge-gitops-vms
 
 vms:
diff --git a/overrides/values-odf-chart.yaml b/overrides/values-odf-chart.yaml
index 1dfac0ed..539df3c1 100644
--- a/overrides/values-odf-chart.yaml
+++ b/overrides/values-odf-chart.yaml
@@ -1,6 +1,5 @@
 ---
 storageSystem:
-  deploy: false
   inventory:
     useSpecificNodes: false
 
diff --git a/pattern-metadata.yaml b/pattern-metadata.yaml
index af4e2ffc..18bbce76 100644
--- a/pattern-metadata.yaml
+++ b/pattern-metadata.yaml
@@ -20,11 +20,23 @@ requirements:
         aws:
           replicas: 3
           type: m5.metal
+        azure:
+          replicas: 3
+          type: Standard_D64s_v3
+        gcp:
+          replicas: 3
+          type: n2-standard-48
     controlPlane:
       platform:
         aws:
           replicas: 3
-          type: m5.4xlarge
+          type: m5.xlarge
+        azure:
+          replicas: 3
+          type: Standard_D4s_v3
+        gcp:
+          replicas: 3
+          type: n1-standard-4
 
 # Loosely defined extra features like hypershift support, non-openshift
 # kubernetes support, spoke support
diff --git a/values-hub.yaml b/values-hub.yaml
index 4a620243..37202398 100644
--- a/values-hub.yaml
+++ b/values-hub.yaml
@@ -57,7 +57,7 @@ clusterGroup:
       name: odf
       namespace: openshift-storage
       chart: openshift-data-foundations
-      chartVersion: 0.2.*
+      chartVersion: 0.3.*
       extraValueFiles:
         - $patternref/overrides/values-odf-chart.yaml
     ensure-openshift-console-plugins: