diff --git a/.github/workflows/deploy-grafana-dashboards.yaml b/.github/workflows/deploy-grafana-dashboards.yaml
index 23e292702f..d330ab3357 100644
--- a/.github/workflows/deploy-grafana-dashboards.yaml
+++ b/.github/workflows/deploy-grafana-dashboards.yaml
@@ -41,7 +41,6 @@ jobs:
           - cluster_name: openscapes
           - cluster_name: opensci
           - cluster_name: pangeo-hubs
-          - cluster_name: pchub
           - cluster_name: projectpythia
           - cluster_name: queensu
           - cluster_name: smithsonian
diff --git a/.github/workflows/deploy-hubs.yaml b/.github/workflows/deploy-hubs.yaml
index 4f209f4bbe..96c690949a 100644
--- a/.github/workflows/deploy-hubs.yaml
+++ b/.github/workflows/deploy-hubs.yaml
@@ -250,7 +250,6 @@ jobs:
       failure_openscapes: "${{ env.failure_openscapes }}"
       failure_opensci: "${{ env.failure_opensci }}"
       failure_pangeo-hubs: "${{ env.failure_pangeo-hubs }}"
-      failure_pchub: "${{ env.failure_pchub }}"
       failure_projectpythia: "${{ env.failure_projectpythia }}"
       failure_queensu: "${{ env.failure_queensu }}"
       failure_smithsonian: "${{ env.failure_smithsonian }}"
diff --git a/config/clusters/pchub/cluster.yaml b/config/clusters/pchub/cluster.yaml
deleted file mode 100644
index 0c54e4cc62..0000000000
--- a/config/clusters/pchub/cluster.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: pchub
-provider: kubeconfig # azure based
-# account: support@2i2c.org
-kubeconfig:
-  file: enc-deployer-credentials.secret.yaml
-support:
-  helm_chart_values_files:
-    - support.values.yaml
-    - enc-support.secret.values.yaml
-hubs:
-  - name: staging
-    display_name: "PC Hub (staging)"
-    domain: staging.pchub.2i2c.cloud
-    helm_chart: daskhub
-    helm_chart_values_files:
-      - common.values.yaml
-      - staging.values.yaml
-      - enc-staging.secret.values.yaml
-  - name: prod
-    display_name: "PC Hub (prod)"
-    domain: pchub.2i2c.cloud
-    helm_chart: daskhub
-    helm_chart_values_files:
-      - common.values.yaml
-      - prod.values.yaml
-      - enc-prod.secret.values.yaml
diff --git a/config/clusters/pchub/common.values.yaml b/config/clusters/pchub/common.values.yaml
deleted file mode 100644
index 6637b15344..0000000000
--- a/config/clusters/pchub/common.values.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-basehub:
-  nfs:
-    enabled: true
-    pv:
-      enabled: true
-      # Recommended options from the Azure Portal UI for mounting the share
-      mountOptions:
-        - vers=4
-        - minorversion=1
-        - sec=sys
-      serverIP: 2i2cpchub.file.core.windows.net
-      # Trailing slash is important!
-      baseShareName: /2i2cpchub/homes/
-  dask-gateway:
-    enabled: true
-  jupyterhub:
-    custom:
-      daskhubSetup:
-        enabled: true
-      2i2c:
-        add_staff_user_ids_to_admin_users: true
-        add_staff_user_ids_of_type: "github"
-      jupyterhubConfigurator:
-        enabled: false
-      homepage:
-        gitRepoBranch: "pchub"
-        templateVars:
-          org:
-            name: "2i2c Planetary Computer Hub (tech demo)"
-            url: https://2i2c.org
-            logo_url: https://2i2c.org/media/logo.png
-          designed_by:
-            name: "2i2c"
-            url: https://2i2c.org
-          operated_by:
-            name: "2i2c"
-            url: https://2i2c.org
-          funded_by:
-            name: "2i2c"
-            url: https://2i2c.org
-    hub:
-      allowNamedServers: true
-      config:
-        JupyterHub:
-          authenticator_class: github
-        GitHubOAuthenticator:
-          allowed_organizations:
-            - 2i2c-org:hub-access-for-2i2c-staff
-            - 2i2c-pchub:all-users
-          scope:
-            - read:org
-        Authenticator:
-          admin_users: []
-    singleuser:
-      cloudMetadata:
-        blockWithIptables: false
-      initContainers:
-        - name: volume-mount-ownership-fix
-          image: busybox:1.36.1
-          command:
-            - sh
-            - -c
-            - id && chown 1000:1000 /home/jovyan /home/jovyan/shared && ls -lhd /home/jovyan
-          securityContext:
-            runAsUser: 0
-          volumeMounts:
-            - name: home
-              mountPath: /home/jovyan
-              subPath: "{username}"
-            # Mounted without readonly attribute here,
-            # so we can chown it appropriately
-            - name: home
-              mountPath: /home/jovyan/shared
-              subPath: _shared
-          # this container uses nbgitpuller to mount https://github.com/NASA-IMPACT/veda-docs/ for user pods
-          # image source: https://github.com/NASA-IMPACT/jupyterhub-gitpuller-init
-        - name: jupyterhub-gitpuller-init
-          image: public.ecr.aws/nasa-veda/jupyterhub-gitpuller-init:97eb45f9d23b128aff810e45911857d5cffd05c2
-          env:
-            - name: TARGET_PATH
-              value: PlanetaryComputerExamples
-            - name: SOURCE_REPO
-              value: "https://github.com/microsoft/PlanetaryComputerExamples"
-          volumeMounts:
-            - name: home
-              mountPath: /home/jovyan
-              subPath: "{username}"
-          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
-      storage:
-        extraVolumeMounts:
-          - name: home
-            mountPath: /home/jovyan/shared-public
-            subPath: _shared-public
-            readOnly: false
-          - name: home
-            mountPath: /home/jovyan/shared
-            subPath: _shared
-            readOnly: true
-          - name: dev-shm
-            mountPath: /dev/shm
-      profileList:
-        - display_name: "Pangeo Notebook"
-          slug: pangeo
-          description: Pangeo based notebook with a Python environment
-          default: true
-          kubespawner_override:
-            image: pangeo/pangeo-notebook:2024.05.21
-            default_url: "/lab/tree/PlanetaryComputerExamples/README.md"
-          profile_options: &profile_options
-            resource_allocation: &profile_options_resource_allocation
-              display_name: Resource Allocation
-              choices:
-                mem_1_9:
-                  display_name: 1.9 GB RAM, upto 3.7 CPUs
-                  kubespawner_override:
-                    mem_guarantee: 1991244775
-                    mem_limit: 1991244775
-                    cpu_guarantee: 0.2328125
-                    cpu_limit: 3.725
-                  default: true
-        - display_name: "Rocker Geospatial with RStudio"
-          slug: rocker
-          description: R environment with many geospatial libraries pre-installed
-          kubespawner_override:
-            image: rocker/binder:4.3
-            image_pull_policy: Always
-            # Launch RStudio after the user logs in
-            default_url: /rstudio
-            # Ensures container working dir is homedir
-            # https://github.com/2i2c-org/infrastructure/issues/2559
-            working_dir: /home/rstudio
-          profile_options: *profile_options
-        - display_name: "QGIS on Linux Desktop"
-          slug: qgis
-          description: Linux desktop in the browser, with qgis installed
-          kubespawner_override:
-            # Launch people directly into the Linux desktop when they start
-            default_url: /desktop
-            # Built from https://github.com/2i2c-org/nasa-qgis-image
-            image: quay.io/2i2c/nasa-qgis-image:0d0765090250
-          profile_options: *profile_options
-        - display_name: "Bring your own image"
-          description: Specify your own docker image (must have python and jupyterhub installed in it)
-          slug: custom
-          profile_options:
-            image:
-              display_name: Image
-              unlisted_choice:
-                enabled: True
-                display_name: "Custom image"
-                validation_regex: "^.+:.+$"
-                validation_message: "Must be a publicly available docker image, of form <image-name>:<tag>"
-                kubespawner_override:
-                  image: "{value}"
-              choices: {}
-            resource_allocation: *profile_options_resource_allocation
-
-    scheduling:
-      userScheduler:
-        enabled: true
diff --git a/config/clusters/pchub/enc-deployer-credentials.secret.yaml b/config/clusters/pchub/enc-deployer-credentials.secret.yaml
deleted file mode 100644
index 446c510abe..0000000000
--- a/config/clusters/pchub/enc-deployer-credentials.secret.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: ENC[AES256_GCM,data:tZc=,iv:wZLNjgWy0kuY2eE6jZ5EXAXhiuJeOxt0z1PF+JZnmOU=,tag:+zxr79yexlrSmAAdTZM8jQ==,type:str]
-clusters:
-    - cluster:
-        certificate-authority-data: ENC[AES256_GCM,data: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,iv:O+Yy7JBiEi0Pcibw9/71p/cOr/fZqtUPpV0clQL4X5w=,tag:F6Bb1F2crXgPVAgAS58X2g==,type:str]
-        server: ENC[AES256_GCM,data:CBLj4nT1kbbouq440sJIpsfW97NqK2dv1y37+rmhBitp1e0NTpweQ0bfyBBHHZqzVA==,iv:ht0EMOq7j6DAQM3BspYH19mBEjObsYPa4TK9jh6TLXM=,tag:/7RHrRxkmJmLh/dNt69YpA==,type:str]
-      name: ENC[AES256_GCM,data:6ha8p3CWIh4YzVw=,iv:2M3QfrnyjvSstMtyV+iEWPjGk10n0KYfhF58tqHg2X4=,tag:BzTEK3WdO2szd4eBMkJU4A==,type:str]
-contexts:
-    - context:
-        cluster: ENC[AES256_GCM,data:FGn3ww0JhTqyqh0=,iv:sLYwKK5Ws16D/hWY9v/KpZ+YWDINZh46FiYWb52Dlhg=,tag:1aUzyk3pg1r7/IeDGULs7A==,type:str]
-        user: ENC[AES256_GCM,data:ITYtFt+jAXD/AkfDiDXPio3le1A1rLfTfwQUCB68XDHi1A==,iv:7C5E/f5HO4IgwfTCNbMSKZnK1OwvyoQEa48KOCzB2cg=,tag:ERzTlNZ5iMTFS6LZyokf3g==,type:str]
-      name: ENC[AES256_GCM,data:EoTiqWP1oyVLlA4=,iv:dV39Jpr7H85XGCK3VW0ICrq+6aBb3c4cPKkfRRyeWRQ=,tag:En+2CS/HVwe5CuP//VyUxg==,type:str]
-current-context: ENC[AES256_GCM,data:EL/bY5UurUpRwwU=,iv:RPCVswCi9EoM/vuLXVeLYQEizQl2D0qwMYQsq7n1KJI=,tag:Vjl8N/YhGOGNIzBv3ucOmQ==,type:str]
-kind: ENC[AES256_GCM,data:XzUbzqwP,iv:LLxGUKUEAtjqJqCLsFRHat2koCZ1pw2n/XGON4ZdC1o=,tag:9tQPE1eDAOimTBzdUTHl7w==,type:str]
-preferences: {}
-users:
-    - name: ENC[AES256_GCM,data:AlCD/7c/bCrQVLqjUG8GF7LhOdxVAUWXpmV5AwgwI9TeYA==,iv:vB6uNQf1bNGSLqRewJcsJw8+udM9hg7255xvFix8DNA=,tag:C7w3tDn51/x1vh7S3MdRew==,type:str]
-      user:
-        client-certificate-data: ENC[AES256_GCM,data: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,iv:odnvhQQNoMUIdfGcgjCH2eJbeKmY8p8WflRGv+EYeyk=,tag:JHS4kAkbf5NT0cSW/dHTog==,type:str]
-        client-key-data: ENC[AES256_GCM,data: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,iv:FzR4M/1nJ5uSXSeU4iZCXfSbdLZcB3sEEaxWqf77VCo=,tag:IEklLH9j0jPJiq7AtF9Lpg==,type:str]
-        token: ENC[AES256_GCM,data:y/M9A0qPnRDWb8dS+o5S1aX/DTtlHy27y8BDwmUdeexAVcD0RucRRZGwN2B9dTNQ3uRBueJjDBGEV7g8ZMK+VXghTrGeHAFNQ+ILJawQyQ3Qx5SIsXijWVOPXrMeSuwxeJM5656DRHzIJB0I0PpMgX0h2R64cI54S6YuBdec0/c=,iv:SqPY2R0E5ZuPvgVStwrC8MjBgGr+IBlHKLcC5oGibT0=,tag:eAhCwbBfslgfNbkWbPYw+Q==,type:str]
-sops:
-    kms: []
-    gcp_kms:
-        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2024-05-30T22:36:42Z"
-          enc: CiUA4OM7eAFonhz2OWXPfjtFX6n4nTcCN1vZLKVS4S6sGCMco3sAEkkAWX/fcfKR/xfXoihhSnY4U0boaGNd6tCTa34xZtUHntNvwsTgiVn2E4KxBRwCP5EltaKFFoUXm5cOfNo1Y4pdstUB+Co8Z6av
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-05-30T22:36:42Z"
-    mac: ENC[AES256_GCM,data:WNbTgIZGXbV6/l0uM8Jbsjj+cblM+gk8hf3vHA6kUuxvg3lgOoI4RtvIowDgvpvIRenvD/AKuYc2scQczSSNYZMxRU8ffnXtJreX6nVx6r7b0zT0lji1jtIXrbMEwB5Jo5vszb9Uqb+2voD3VXC3y9zOI/RqSpgUaAp20geOuOU=,iv:rRLT21l4HMMdwp0A5/H2Dv8XFCCdXrl8cXTdn7GMuZg=,tag:1W5cmbU71P9kby9Rgwm6fQ==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
diff --git a/config/clusters/pchub/enc-grafana-token.secret.yaml b/config/clusters/pchub/enc-grafana-token.secret.yaml
deleted file mode 100644
index 67d5ba9b39..0000000000
--- a/config/clusters/pchub/enc-grafana-token.secret.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-grafana_token: ENC[AES256_GCM,data:wTAK0ghkzrMHgzwmg/7dn2SKgccADBD/GMWiQbC0rR3iF74OpjrTzO9G/kEXiQ==,iv:Yaw/iF9z99eZKbWq1Fwf7By72DU52lHZbvfUVq2br64=,tag:SrCewcHezJTIC9rCcawxoQ==,type:str]
-sops:
-    kms: []
-    gcp_kms:
-        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2024-06-25T06:30:27Z"
-          enc: CiUA4OM7eBG20vFsSUH1WZGvDV8rqbHbrCuQVICO6aaml5QdDsObEkkAWX/fcX8UORD37bP+HcneFUG4bk7LlOEI0S+oHVMX7WNLGSiHLnhCUp0lD02lTrjUrvopdmUPI2XH3jF/qfxt89csAvG/IjL2
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-06-25T06:30:28Z"
-    mac: ENC[AES256_GCM,data:g7RrYsC5eXWNvoR+v63y/DOoe2vLUTXNDP9BB4ExM1IIvJxntJUnIsCp/IZqOT2PO50vjHGeYx+Mi3IVLIh9EKaQ+e4xCF+lmZ8Cw++YakmB4gJ2AoQgJtBS+RYZS/Cp66QTbaieb5VwHDhHvIABUJ5JstVdhslFHcEGIVEOCnQ=,iv:+ghpdoIK+bMhIJi7MEQ41DAdb1mLFkSjvPjrERR9VjE=,tag:PbWs1b7JT0rs8ybk7hBqpA==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
diff --git a/config/clusters/pchub/enc-prod.secret.values.yaml b/config/clusters/pchub/enc-prod.secret.values.yaml
deleted file mode 100644
index d9ee2f8b9a..0000000000
--- a/config/clusters/pchub/enc-prod.secret.values.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-basehub:
-    jupyterhub:
-        hub:
-            config:
-                GitHubOAuthenticator:
-                    client_id: ENC[AES256_GCM,data:9ncqJ7x46gyBEHezFDhK34IH0Zg=,iv:hlEJ5j+3yxPOBxqLksjRP1banEPyur5Oa9ZYZPOLrOE=,tag:liwnbWwQhB/Fik3LRdzQlg==,type:str]
-                    client_secret: ENC[AES256_GCM,data:FmaqqYS9pAZtnuhzeXMdoUsyALagyMg8jpggfQYYjS3LbxqTx8hW1w==,iv:JMfi9zPVx3/AL9YlvxzUI4dxUQXyRGUqxlT/JNOm2eE=,tag:AskozS8KbexNhizlgQsBVg==,type:str]
-sops:
-    kms: []
-    gcp_kms:
-        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-01-26T14:56:28Z"
-          enc: CiUA4OM7eCKAfS822SeCDOvwyvK2He3x++XchB5U0Z2uRygrlE6PEkkA+0T9hQrtx2RjWzpuy8LDTafDdeFrNE1Ehco2aOXWi5EaMoT3PrOR9aaeynZo+a9RFNp3duwN37lnDIEBdrV0pxASZ+Ok1ct3
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-05-30T23:30:28Z"
-    mac: ENC[AES256_GCM,data:nhnw9sKSRWKy+TTr72tmlLsI8RwjMndhF8sC4Y5suyBJ22UPPr0BtRkqZq4lclaPYn7vNtGhbaCxrvIQad6CeAbbMWkKHQmfSWqXZZ4Iu7wJVnsRG6BYu4iZYXEtm1El7hbYyqmgjAbrPIfjr2GxUDNwbV/F0Q+7xseemwZbZ2k=,iv:rrzq7XK98yK+LkENda1xT2WM6fCQjCv9/7gnH24I5ok=,tag:8cwh07g4E73wxv0ZcwzN/A==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
diff --git a/config/clusters/pchub/enc-staging.secret.values.yaml b/config/clusters/pchub/enc-staging.secret.values.yaml
deleted file mode 100644
index c4895c6c87..0000000000
--- a/config/clusters/pchub/enc-staging.secret.values.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-basehub:
-    jupyterhub:
-        hub:
-            config:
-                GitHubOAuthenticator:
-                    client_id: ENC[AES256_GCM,data:Cwl6z2D6vyjdPy4WTO+3qkMHIqs=,iv:8sIz6cKGycjveKPMTd/TPSiJCc6YVfHMkhe56Q0TAVY=,tag:MySxwk+YgV+V766Jw3EzIQ==,type:str]
-                    client_secret: ENC[AES256_GCM,data:vGv8T4BjNs7X1Vke4zBKGvNcREC4fYRI3nupOnzUX0izmxFtuxNHtA==,iv:zN44YamgfiDxlpDoWo7/hVNXWVw5BFau6r9LszmORMQ=,tag:ucY7v54Tyt99AQSUcXqBbA==,type:str]
-sops:
-    kms: []
-    gcp_kms:
-        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-01-26T14:56:28Z"
-          enc: CiUA4OM7eCKAfS822SeCDOvwyvK2He3x++XchB5U0Z2uRygrlE6PEkkA+0T9hQrtx2RjWzpuy8LDTafDdeFrNE1Ehco2aOXWi5EaMoT3PrOR9aaeynZo+a9RFNp3duwN37lnDIEBdrV0pxASZ+Ok1ct3
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2024-05-30T23:48:11Z"
-    mac: ENC[AES256_GCM,data:siVC3nCiFC5v0hvuOuLuTmagwmVxZLzblRs9poweXPdFJDsFtJPLvqTyH4W5PNwfaE3XrOCe6EVWJO1Tq2Qr3N0z9rZ/FXQFjIhhX3bNhUTIg43afQ8fqmEkmEHiGGSmzghWfDwftODXw34Pc0WCNyDHr2nIiODZ7iZK8zAlNfs=,iv:LB41f0Otyce2dX0XwD7ZZVRaI7/wdW1B2r3Weuc1+sw=,tag:FFBGfzPK0O+Ly9B6lgUZ7w==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1
diff --git a/config/clusters/pchub/enc-support.secret.values.yaml b/config/clusters/pchub/enc-support.secret.values.yaml
deleted file mode 100644
index 6e1d96c532..0000000000
--- a/config/clusters/pchub/enc-support.secret.values.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-prometheusIngressAuthSecret:
-    username: ENC[AES256_GCM,data:2ub6n2kKYjWWSsng1V/0eVPm5mXdxazBhe3lWknfRweur+sX6gWimBwW9fj3w7lAH068PsEWWgjTG2ZoSDSFsA==,iv:Ark6kfCamRVIdxk8pemStIwalu0kgOb56rHBvnNb1/8=,tag:O/WVZv75QD9JluNlFPWflg==,type:str]
-    password: ENC[AES256_GCM,data:KUwQV5C2vh4bQwg6AGD50prZJ+3/laR7k7mt61jQVG1LMlPtgCzU/pkvES55oklWJ7i4HSuLEpjApVjwfLFXWg==,iv:IQheCbGfPXLYiuKAJxgR0BUmXFYNawl6Ev58xBg/zXY=,tag:cS94tF1+ry2SsjTTzauk8w==,type:str]
-grafana:
-    grafana.ini:
-        auth.github:
-            client_id: ENC[AES256_GCM,data:pg9Y7t0yDYY6wffxat4wwRwC9+g=,iv:Pz6ig2wcVVoSN4m1srHaVUA3eUhZ69Tao1Vz0MMYaqY=,tag:PbL6xEJsZxTsaienW1fBgQ==,type:str]
-            client_secret: ENC[AES256_GCM,data:YZeTMcHmKeI7ZtvsSA5ixaeaPnwby1KlP6D/sKfooAdwtD71rH1a/g==,iv:fc+sUhZlxxxxzA7eRjWPQ52AWE6ciE/S1vOjZmTjuEk=,tag:16FaLIqBREeEay9JXSqVdg==,type:str]
-sops:
-    kms: []
-    gcp_kms:
-        - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2022-03-14T20:52:46Z"
-          enc: CiQA4OM7eKEs+5+z5XPzC5fE1ZQ1lowq/iBPLuvjCk2qTnujJQISSADm5XgWOx4kAXNW5kUSyr9Y9Pd7LGO7r93VJCTxsG17j/V21g+3HH3Xr5NWt9PJ/TmnWyKQrhsA51vxBVTZXt8itFluccbFng==
-    azure_kv: []
-    hc_vault: []
-    age: []
-    lastmodified: "2023-02-08T14:11:59Z"
-    mac: ENC[AES256_GCM,data:av4k45kvQJ9lkqQu86e2QHePXi2f3FGoriE7gSUH18SMj4O136P94llrWTEDttddDkw7cgaEjvB+eJQoDgZaSpOlVAf//apOqopt5A9CkXQ4AECLFBTXJKJi9mqltS8TUPbvdmEQEpL9U5zJuP7SfmaF2+pjPbyB0W1D3xdsEGM=,iv:t2Dam7qD2ZZQX2vwV5LY+Lepyr4M4+mxiWygbZixomI=,tag:BLGyhg/Dj9eEUBrobpAMPw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.7.2
diff --git a/config/clusters/pchub/prod.values.yaml b/config/clusters/pchub/prod.values.yaml
deleted file mode 100644
index 43ecd04e5b..0000000000
--- a/config/clusters/pchub/prod.values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-basehub:
-  jupyterhub:
-    ingress:
-      hosts: [pchub.2i2c.cloud]
-      tls:
-        - hosts: [pchub.2i2c.cloud]
-          secretName: https-auto-tls
-    hub:
-      config:
-        GitHubOAuthenticator:
-          oauth_callback_url: https://pchub.2i2c.cloud/hub/oauth_callback
diff --git a/config/clusters/pchub/staging.values.yaml b/config/clusters/pchub/staging.values.yaml
deleted file mode 100644
index cd0d01fa4d..0000000000
--- a/config/clusters/pchub/staging.values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-basehub:
-  jupyterhub:
-    ingress:
-      hosts: [staging.pchub.2i2c.cloud]
-      tls:
-        - hosts: [staging.pchub.2i2c.cloud]
-          secretName: https-auto-tls
-    hub:
-      config:
-        GitHubOAuthenticator:
-          oauth_callback_url: https://staging.pchub.2i2c.cloud/hub/oauth_callback
diff --git a/config/clusters/pchub/support.values.yaml b/config/clusters/pchub/support.values.yaml
deleted file mode 100644
index df8c727365..0000000000
--- a/config/clusters/pchub/support.values.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-prometheusIngressAuthSecret:
-  enabled: true
-
-prometheus:
-  server:
-    # Bumped as part of https://github.com/2i2c-org/infrastructure/issues/4632
-    persistentVolume:
-      size: 500Gi
-    ingress:
-      enabled: true
-      hosts:
-        - prometheus.pchub.2i2c.cloud
-      tls:
-        - secretName: prometheus-tls
-          hosts:
-            - prometheus.pchub.2i2c.cloud
-
-grafana:
-  grafana.ini:
-    server:
-      root_url: https://grafana.pchub.2i2c.cloud/
-    auth.github:
-      enabled: true
-      allowed_organizations: 2i2c-org
-  ingress:
-    hosts:
-      - grafana.pchub.2i2c.cloud
-    tls:
-      - secretName: grafana-tls
-        hosts:
-          - grafana.pchub.2i2c.cloud
-
-ingress-nginx:
-  controller:
-    service:
-      annotations:
-        # This annotation is a requirement for use in Azure provided
-        # LoadBalancer.
-        #
-        # ref: https://learn.microsoft.com/en-us/azure/aks/ingress-basic?tabs=azure-cli#basic-configuration
-        # ref: https://github.com/Azure/AKS/blob/master/CHANGELOG.md#release-2022-09-11
-        # ref: https://github.com/Azure/AKS/issues/2907#issuecomment-1109759262
-        # ref: https://github.com/kubernetes/ingress-nginx/issues/8501#issuecomment-1108428615
-        #
-        service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path: /healthz
diff --git a/terraform/azure/projects/pchub.tfvars b/terraform/azure/projects/pchub.tfvars
deleted file mode 100644
index f0732c627a..0000000000
--- a/terraform/azure/projects/pchub.tfvars
+++ /dev/null
@@ -1,77 +0,0 @@
-# IMPORTANT: Due to a restrictive network rule from storage.tf, we can't perform
-#            "terraform plan" or "terraform apply" without a workaround.
-#
-#            One known workaround is to allow your public IP temporarily as
-#            discussed in https://github.com/2i2c-org/infrastructure/issues/890#issuecomment-1879072422.
-#            This workaround is problematic as that may temporarily allow access
-#            to storage by other actors with the same IP.
-#
-# SETTING UP TO WORK WITH THIS FILE:
-# ----------------------------------
-#
-# The Azure account for this cluster has MFA enabled. The username, password and
-# TOTP token are stored in the 2i2c shared Bitwarden account. To authenticate the
-# Azure CLI, run:
-#
-#     az login --tenant f1123d69-0c31-44db-ab9f-fa856d721d49
-#
-tenant_id                      = "f1123d69-0c31-44db-ab9f-fa856d721d49"
-subscription_id                = "4ca0b08a-26e1-482f-bca6-f4eb0926124a"
-resourcegroup_name             = "2i2c-pchub"
-create_container_registry      = true
-global_container_registry_name = "2i2cpchub"
-global_storage_account_name    = "2i2cpchub"
-location                       = "westeurope"
-
-budget_alert_enabled = true
-# This is approximate total cost for Jun 2024 in USD
-budget_alert_amount = "500"
-
-storage_size = 100
-ssh_pub_key  = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDEswiqOZ3cdu+OaT1K3ay8brlnnoHIpDyKNfLGeRAFQ4ZP+1OD82CIwrUiU4GhmiKTyyN9DWuKKhbEjMIrAKnoybQZBk/x21sHLyrqit1wq/X+f7/SKqDTFQGFYO5cERl/MwMRIp5WHEcLXi6WnaRczCQxOW6J36V5/frynz2Qq/3XwhQnkW9401HYt9H4Ur6JTZC0G0hMVklIT+gGsIml6Qu2O8+iuA2saGn3SCmTs7WBxVsEQTFt1w6JoJi4ohi7RtlT9QDSx4J+cawBNqzAK+gkozj2lN5Yiq7gtPJMe8sdLqmg9vSPCuAMMZeP+DhEGbre7Y+MMplSJrqkeT61WeCl39ffqwievGFkdTxzCiqX9TKSR2SS98W6jpCYrSkA1ymzn+HUADfyszU7sn6/F9I2w8oUbuFfMKDD4XfgkdK7Jqew7YJ4CDK2f4D94MWAmFicVKsYXPautnk+d3JqXarUN7k8bF9On2N8xZln0Zsui/Pmj1jQsnm0KXZOb9k= yuvipanda@instantaneous-authenticity.local"
-
-# List available versions via: az aks get-versions --location westus2 -o table
-kubernetes_version = "1.29.4"
-
-# Free, the default, is not available in westeurope
-cluster_sku_tier = "Standard"
-
-node_pools = {
-  core : [
-    {
-      name : "core",
-      vm_size : "Standard_E2_v4",
-
-      # core nodes doesn't need much disk space
-      os_disk_size_gb : 40,
-
-      # FIXME: Stop using persistent disks for the nodes, use the variable default
-      #        "Temporary" instead by removing this line.
-      #        Currently does not work, as Azure seems to be buggy
-      kubelet_disk_type : "OS",
-
-      min : 1,
-      max : 10,
-    },
-  ],
-
-  user : [
-    {
-      name : "user",
-      vm_size : "Standard_E2_v4",
-      os_disk_size_gb : 100,
-      min : 0,
-      max : 100,
-    },
-  ],
-
-  dask : [
-    {
-      name : "worker",
-      vm_size : "Standard_E16_v4",
-      os_disk_size_gb : 100,
-      min : 0,
-      max : 100,
-    },
-  ],
-}