diff --git a/config/curvenote.yaml b/config/curvenote.yaml
index feb042ca6d..698182bbf6 100644
--- a/config/curvenote.yaml
+++ b/config/curvenote.yaml
@@ -87,8 +87,7 @@ binderhub:
               except httpclient.HTTPError as e:
                   if e.code == 404:
                       return None
-                  else:
-                      raise
+                  raise
 
           async def get_image_manifest(self, image, tag):
               """
@@ -138,8 +137,9 @@ binderhub:
               try:
                   token_json = await self._request(token_url, method="POST", body="")
               except httpclient.HTTPError as e:
-                  if e.code != 404:
-                      raise
+                  if e.code == 404:
+                      return None
+                  raise
               self.log.debug(f"Token: {*token_json.keys(),}")
               token = dict(
                   (k, v)
diff --git a/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml b/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml
index ed440f8f52..7a4ffda39b 100644
--- a/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml
+++ b/mybinder/templates/aws-ecr-registry-cleaner/deployment.yaml
@@ -18,7 +18,6 @@ spec:
       app: aws-ecr-registry-cleaner
       component: aws-ecr-registry-cleaner
       release: {{ .Release.Name }}
-  replicas: 1
   template:
     metadata:
       labels: