diff --git a/roles/run-buildset-registry/tasks/main.yaml b/roles/run-buildset-registry/tasks/main.yaml
index 226e5f764..3c0cab05e 100644
--- a/roles/run-buildset-registry/tasks/main.yaml
+++ b/roles/run-buildset-registry/tasks/main.yaml
@@ -25,10 +25,9 @@
   loop:
     - certs
     - auth
-# TODO: use password lookup after allowing access to it in Zuul
 - name: Generate registry password
   set_fact:
-    registry_password: "{{ (ansible_date_time.iso8601_micro | password_hash('sha256'))[-20:] }}"
+    registry_password: "{{ lookup('password', '/dev/null') }}"
 - name: Write htpassword file
   htpasswd:
     create: true