diff --git a/.github/workflows/diff.yml b/.github/workflows/diff.yml
index 9edfeafd9..c4a1263af 100644
--- a/.github/workflows/diff.yml
+++ b/.github/workflows/diff.yml
@@ -48,20 +48,14 @@ jobs:
 
           # NOTE: We change the directory so binderhub the chart name won't be
           #       misunderstood as the local folder name.
-          # validation is disabled, because the config is for a different version!
+          #
+          #       https://github.com/helm/helm/issues/9244
+          #
           cd testing
 
-          old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml"
-          if [ -f "$old_config" ]; then
-            echo "using old config"
-          else
-            old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml"
-          fi
-
           helm install binderhub-test binderhub \
-              --values "$old_config" \
-              --repo https://jupyterhub.github.io/helm-chart/ \
-              --disable-openapi-validation \
+              --values=../testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml \
+              --repo=https://jupyterhub.github.io/helm-chart/ \
               --version=$UPGRADE_FROM_VERSION
 
       - name: "Helm diff latest released dev chart with local chart"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 36ef10b86..f79cbac00 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -249,24 +249,17 @@ jobs:
           echo ""
           echo "Installing already released binderhub version $UPGRADE_FROM_VERSION"
 
-          # FIXME: We change the directory so binderhub the chart name won't be
-          #        misunderstood as the local folder name.
+          # NOTE: We change the directory so binderhub the chart name won't be
+          #       misunderstood as the local folder name.
+          #
+          #       https://github.com/helm/helm/issues/9244
           #
-          #        https://github.com/helm/helm/issues/9244
           cd ci
 
-          old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml"
-          if [ -f "$old_config" ]; then
-            echo "using old config"
-          else
-            old_config="../testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml"
-          fi
-
           helm install binderhub-test \
               --repo https://jupyterhub.github.io/helm-chart/ binderhub \
-              --disable-openapi-validation \
               --version=$UPGRADE_FROM_VERSION \
-              --values "$old_config" \
+              --values=../testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml \
               --set config.BinderHub.hub_url=http://localhost:30902 \
               --set config.BinderHub.hub_url_local=http://proxy-public \
               --set config.GitHubRepoProvider.access_token=$GITHUB_ACCESS_TOKEN \
diff --git a/testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml b/testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml
deleted file mode 100644
index 1e2835884..000000000
--- a/testing/k8s-binder-k8s-hub/binderhub-chart-config-old.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# (DELETE ME)
-# this file should be removed immediately after merging PR #1472
-
-service:
-  type: NodePort
-  nodePort: 30901
-
-config:
-  BinderHub:
-    # Use the internal host name for Pod to Pod communication
-    # We can't use `hub_url` here because that is set to localhost which
-    # works on the host but not from within a Pod
-    hub_url_local: http://proxy-public
-    use_registry: false
-    log_level: 10
-    cors_allow_origin: "*"
-
-ingress:
-  # Enabled to test the creation/update of the k8s Ingress resource, but not
-  # used actively in our CI system.
-  enabled: true
-
-# Not using dind to test the creation/update of the image-cleaner DaemonSet
-# resource because it also requires us to setup a container registry to test
-# against which we haven't. We currently only test this via
-# lint-and-validate-values.yaml that makes sure our rendered templates are
-# valid against a k8s api-server.
-imageBuilderType: host
-
-# NOTE: This is a mirror of the jupyterhub section in
-#       jupyterhub-chart-config.yaml in testing/local-binder-k8s-hub, keep these
-#       two files synced please.
-jupyterhub:
-  debug:
-    enabled: true
-
-  hub:
-    config:
-      BinderSpawner:
-        cors_allow_origin: "*"
-    db:
-      type: "sqlite-memory"
-
-  proxy:
-    service:
-      type: NodePort
-      nodePorts:
-        http: 30902
-
-  singleuser:
-    storage:
-      type: none
-    memory:
-      guarantee: null
diff --git a/testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml b/testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml
index 9b3d470c6..f88866f63 100644
--- a/testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml
+++ b/testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml
@@ -1,8 +1,5 @@
 # This config is used when both BinderHub and the JupyterHub it uses are
 # deployed to a kubernetes cluster.
-# note: when changing the config schema,
-# the old version of this file may need to be copied to ./binderhub-chart-config-old.yaml
-# before updating, and then deleted in a subsequent PR.
 
 service:
   type: NodePort