diff --git a/.gitlab-ci/b2c/generate_b2c.py b/.gitlab-ci/b2c/generate_b2c.py
index 976c5b4e37c..830aa8d7e7b 100755
--- a/.gitlab-ci/b2c/generate_b2c.py
+++ b/.gitlab-ci/b2c/generate_b2c.py
@@ -92,10 +92,12 @@ if args.mount_volume is not None:
 values['working_dir'] = args.working_dir
 
 assert(len(args.local_container) > 0)
-values['local_container'] = args.local_container.replace(
-    # Use the gateway's pull-through registry cache to reduce load on fd.o.
-    'registry.freedesktop.org', '{{ fdo_proxy_registry }}'
-)
+
+# Use the gateway's pull-through registry caches to reduce load on fd.o.
+values['local_container'] = args.local_container
+for url, replacement in [('registry.freedesktop.org', '{{ fdo_proxy_registry }}'),
+                         ('harbor.freedesktop.org', '{{ harbor_fdo_registry }}')]:
+    values['local_container'] = values['local_container'].replace(url, replacement)
 
 if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ:
     values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS']
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index ac0a237e0fb..fa094aacf22 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -241,9 +241,6 @@ rustfmt:
     # We don't want the tarball unpacking of .test, but will take the JWT bits.
     - !reference [default, before_script]
 
-    # temporary overrides to allow others to use harbor.freedesktop.org
-    - export IMAGE_UNDER_TEST=${IMAGE_UNDER_TEST/harbor/registry}
-
     - |
       set -x