diff --git a/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml b/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml
index 8a7d4cf838..1138520e39 100644
--- a/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml
+++ b/config/clusters/2i2c/enc-imagebuilding-demo.secret.values.yaml
@@ -1,23 +1,23 @@
 binderhub-service:
     buildPodsRegistryCredentials:
-        password: ENC[AES256_GCM,data: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,iv:0+34W6adUVI8wBO4oWTYX1LpFBrV6mxz+zh4FTUdzQw=,tag:CnErqoj/esIP3b4OKfoj0g==,type:str]
+        password: ENC[AES256_GCM,data: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,iv:Fr6VUfSfac5BrF/WGSTz0NUEsYAtQJmTFTLQUAgr7vg=,tag:5ch5EIGE0bz06GMBEywQwg==,type:str]
 jupyterhub:
     hub:
         config:
-            CILogonOAuthenticator:
-                client_id: ENC[AES256_GCM,data:v3yiJA0ir2lC1qf/1ih5iLLdfiBSg1B+XEREYcrHwF0j+Srx7LV/3AKsWEHKnFB3hOw=,iv:oEcT6PsStTBiYO+GLREnLRTCR7eLeaHdqHWWRRrbc0E=,tag:hx9TAfhzKMqgexWhNd8H5g==,type:str]
-                client_secret: ENC[AES256_GCM,data:+U2J6N0R05DfCwhcest0oBRXv1356e9jeGQTR57Pum24MaE4xFLSt5uQsT7bOAXKF/s8lV1vrDomoPBGuhZ+3t/iCFlS/9KYsDCBLbjDBR/MZFWWWEk=,iv:tZqmBcBhe84BQrNaTEnYTMt9lG4KDU/OJlKYMHqxEf4=,tag:I3X3K+OH1JjKpSFwITvUHw==,type:str]
+            GitHubOAuthenticator:
+                client_id: ENC[AES256_GCM,data:N/UaoM3oTyfzYJEjRfyylTmBTko=,iv:lRgkkugAUmEsetnTyKDFEyPPZU6mp9ab9gC7XseXKlc=,tag:sZNyokWoUBydrA0caZHuVQ==,type:str]
+                client_secret: ENC[AES256_GCM,data:RZVwxeW1v47xJmEjUjk4+6Lm0JJRZGc50m64qcC8HPCrNmqI+6sQug==,iv:uAsmQGSO1wWsshN/ar3/M1uNWZVGTjdBpU2ebSSUKCs=,tag:tD3dDvF7CslK/5Bovjirig==,type:str]
 sops:
     kms: []
     gcp_kms:
         - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-          created_at: "2023-07-17T08:45:20Z"
-          enc: CiUA4OM7eMiDjL9h2JVoUk0z51mi94Tov+v2PxCEx9zTshKYF1HlEkkAyiwFHGf++4gB28i3Fcz+7sjHshU7Jd9nogf3dtzpYqZ5AqreK8ONJ3gQTl1WVOjMiDEUrHhWSydPJuO0FR180PtVqAzkQfkz
+          created_at: "2023-09-18T19:00:41Z"
+          enc: CiUA4OM7eFioG9yDgVwKtc0cYrU65GNcqMSDuUgnuXuq3KW9dRI6EkkAq2nhVV2TFrZOq5jktjMd4TQF1lwH/08tAyGd3vMfBmdd3Xdy3bAUUHhrPXcK6QabMRYdXPzQzgB+oBGaqOsJO7D7jT9NpeCn
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-07-17T08:45:20Z"
-    mac: ENC[AES256_GCM,data:m0mqujIYiJfZLUKy9/jmXpIn6sypJkZ/GgJNWMeEqaecUUUvtnMNsCzzWxojWd/cMkQJCGEoTbswI18sA2j/J0jewdnziTvPfQqvf52nHwSDfRdiqWKneX+TAJxagSxfK2FTurRGRIGqgv4jqT0ATO3CqNhyMSWifBeGW7q9QXY=,iv:jJd+1AxYIBz1GkuzaPd7SzACh+iXFLzcEPe3eEEnNVA=,tag:DPoo2i8YmEUQZ4Q2Y7BF+g==,type:str]
+    lastmodified: "2023-09-18T19:00:42Z"
+    mac: ENC[AES256_GCM,data:hI4hSFj6MN/w5nMrl3YF1XsI9rcOdJyu49acNhh8ThQnag3Nm3p6TqDAT6Fg0VZmhcnpyHaGJabRxeB2mzV4EWY8fLviY4lcyPcRUZux5dDBksUww2zYTZLBZj/9rauOCWFBr4a8txkP7puJZlD6PLMHlcvDIzsY4/rON6UKULI=,iv:hfXFohpnlzvJOC1MOXlz1ewqlCUfjxaDt8gV3lp+0YQ=,tag:vA3L5lJngO0dX4wqOsAfPQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/2i2c/imagebuilding-demo.values.yaml b/config/clusters/2i2c/imagebuilding-demo.values.yaml
index 799524b9a9..8983d12149 100644
--- a/config/clusters/2i2c/imagebuilding-demo.values.yaml
+++ b/config/clusters/2i2c/imagebuilding-demo.values.yaml
@@ -9,7 +9,7 @@ jupyterhub:
   custom:
     2i2c:
       add_staff_user_ids_to_admin_users: true
-      add_staff_user_ids_of_type: "google"
+      add_staff_user_ids_of_type: "github"
 
     homepage:
       templateVars:
@@ -124,17 +124,14 @@ jupyterhub:
       tag: "0.0.1-0.dev.git.7029.h44cd314e"
     config:
       JupyterHub:
-        authenticator_class: cilogon
-      CILogonOAuthenticator:
-        oauth_callback_url: "https://imagebuilding-demo.2i2c.cloud/hub/oauth_callback"
-        shown_idps:
-          - http://google.com/accounts/o8/id
-        allowed_idps:
-          http://google.com/accounts/o8/id:
-            username_derivation:
-              username_claim: "email"
-            allowed_domains:
-              - "2i2c.org"
+        authenticator_class: github
+      GitHubOAuthenticator:
+        oauth_callback_url: https://imagebuilding-demo.2i2c.cloud/hub/oauth_callback
+        allowed_organizations:
+          - 2i2c-org:hub-access-for-2i2c-staff
+          - 2i2c-imagebuilding-hub-access
+        scope:
+          - read:org
 
     extraConfig:
       enable-prototype-UI: |