diff --git a/images/taint-manager/Tiltfile b/images/taint-manager/Tiltfile
index 3e83509421..4f783ce202 100644
--- a/images/taint-manager/Tiltfile
+++ b/images/taint-manager/Tiltfile
@@ -78,7 +78,7 @@ load('ext://restart_process', 'docker_build_with_restart')
 
 # Wrap a docker_build to restart the given entrypoint after a Live Update.
 docker_build(
-    'lthub/' + project_name,
+    'jupyterhub/' + project_name,
     '.',
     dockerfile_contents=dockerfile,
     entrypoint='/go/bin/dlv --listen=0.0.0.0:50100 --api-version=2 --headless=true --only-same-user=false --accept-multiclient --check-go-version=false exec -- /usr/local/bin/taintmanager -remove jupyterhub:NoSchedule',
diff --git a/images/taint-manager/deployment.yaml b/images/taint-manager/deployment.yaml
index 109d4e68f0..af82e8620a 100644
--- a/images/taint-manager/deployment.yaml
+++ b/images/taint-manager/deployment.yaml
@@ -13,7 +13,7 @@ spec:
         app: taintmanager
     spec:
       containers:
-        - image: lthub/taintmanager
+        - image: jupyterhub/k8s-taint-manager
           imagePullPolicy: IfNotPresent
           name: taintmanager
           env:
diff --git a/jupyterhub/values.yaml b/jupyterhub/values.yaml
index bb2aee1b77..2356ccb53d 100644
--- a/jupyterhub/values.yaml
+++ b/jupyterhub/values.yaml
@@ -615,8 +615,8 @@ prePuller:
   taintmanager:
     enabled: true
     image:
-      name: lthub/taintmanager
-      tag: master
+      name: jupyterhub/k8s-taint-manager
+      tag: "set-by-chartpress"
     # taint/tolerations used for preventing user pods being scheduled while user image is being pulled
     # only first element in the list is being used
     tolerations: