diff --git a/roles/run-buildset-registry/tasks/main.yaml b/roles/run-buildset-registry/tasks/main.yaml
index d05fe2a4f..23736e778 100644
--- a/roles/run-buildset-registry/tasks/main.yaml
+++ b/roles/run-buildset-registry/tasks/main.yaml
@@ -42,7 +42,7 @@
     certificate: "{{ certificate.content | b64decode }}"
 - name: Start the buildset registry
   docker_container:
-    name: buildset_registry
+    name: "{{ (buildset_registry_port == 5000) | ternary('buildset_registry', 'buildset_registry_' + buildset_registry_port|string) }}"
     image: zuul/zuul-registry:latest
     state: started
     restart_policy: always