diff --git a/playbooks/docker-image/pre.yaml b/playbooks/docker-image/pre.yaml
index 52f5b5b26..3bc338d28 100644
--- a/playbooks/docker-image/pre.yaml
+++ b/playbooks/docker-image/pre.yaml
@@ -1,3 +1,8 @@
 - hosts: all
   roles:
     - install-docker
+  tasks:
+    - name: Configure buildset registry
+      when: buildset_registry is defined
+      include_role:
+        name: use-buildset-registry