diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml
index ec3a1f043d..7f9a46989c 100644
--- a/jenkins/jobs/barbican.yaml
+++ b/jenkins/jobs/barbican.yaml
@@ -39,7 +39,7 @@
       - console-log
 
 - job:
-    name: gate-barbican-dogtag-devstack-dsvm
+    name: gate-barbican-dogtag-devstack-dsvm-f21
     node: 'devstack-f21'
 
     wrappers:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3fa7ad1e62..8aafc74f30 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -725,7 +725,7 @@ jobs:
     voting: false
   - name: designate-coverage
     voting: false
-  - name: gate-barbican-dogtag-devstack-dsvm
+  - name: gate-barbican-dogtag-devstack-dsvm-f21
     voting: false
   - name: gate-congress-python34
     voting: false
@@ -1016,7 +1016,7 @@ projects:
     gate:
       - gate-barbican-devstack-dsvm
     experimental:
-      - gate-barbican-dogtag-devstack-dsvm
+      - gate-barbican-dogtag-devstack-dsvm-f21
 
   - name: openstack/barbican-specs
     template: