diff --git a/deployer/tests/test_hub_health.py b/deployer/tests/test_hub_health.py
index 529f16c387..f2c0061bc0 100644
--- a/deployer/tests/test_hub_health.py
+++ b/deployer/tests/test_hub_health.py
@@ -41,11 +41,6 @@ async def check_hub_health(hub_url, test_notebook_path, service_api_token):
                 # This is because we would have lost its api token from the previous run.
                 await hub.delete_user(username)
 
-        # Temporary fix for https://github.com/2i2c-org/infrastructure/issues/1611
-        # FIXME: Remove this once https://github.com/jupyterhub/kubespawner/pull/631 gets merged
-        user_options = None
-        if ("openscapes" in hub_url) or ("carbonplan" in hub_url):
-            user_options = {"profile": "small", "image": "python"}
         # Create a new user, start a server and execute a notebook
         await execute_notebook(
             hub_url,
@@ -57,7 +52,6 @@ async def check_hub_health(hub_url, test_notebook_path, service_api_token):
             delete_user=False,  # To be able to delete its server in case of failure
             stop_server=True,  # If the health check succeeds, this will delete the server
             validate=False,  # Don't validate notebook outputs. We only care that it runs top-to-bottom without error.
-            user_options=user_options,
         )
     finally:
         if orig_service_token:
diff --git a/helm-charts/basehub/values.yaml b/helm-charts/basehub/values.yaml
index d9c029b4e6..d9c36fada4 100644
--- a/helm-charts/basehub/values.yaml
+++ b/helm-charts/basehub/values.yaml
@@ -379,7 +379,7 @@ jupyterhub:
         admin: true
     image:
       name: quay.io/2i2c/pilot-hub
-      tag: "0.0.1-n4340.ha8608773"
+      tag: "0.0.1-n4378.h27667b54"
     nodeSelector:
       hub.jupyter.org/node-purpose: core
     networkPolicy:
diff --git a/helm-charts/images/hub/requirements.txt b/helm-charts/images/hub/requirements.txt
index 2607afd099..66c64b6f21 100644
--- a/helm-charts/images/hub/requirements.txt
+++ b/helm-charts/images/hub/requirements.txt
@@ -1,4 +1,4 @@
 oauthenticator==15.1.0
 git+https://github.com/yuvipanda/jupyterhub-configurator@ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db
 # Reference https://github.com/2i2c-org/infrastructure/issues/1825
-git+https://github.com/jupyterhub/kubespawner@fa19acdbb056c8d105baab13bbaa2b8b59dfa962
+git+https://github.com/jupyterhub/kubespawner@a666d22609f0acd2db4bd3dd62472f9fb82867a0