diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 5332368eff..fc95088ced 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -53,3 +53,15 @@
       - console-log
 
     node: '{node}'
+
+- job:
+    name: 'sandbox-tag'
+
+    builders:
+      - revoke-sudo
+      - gerrit-git-prep
+
+    publishers:
+      - console-log
+
+    node: 'bare-precise'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 8540f05974..10cfc6668c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2526,6 +2526,10 @@ projects:
       - noop
     gate:
       - noop
+    pre-release:
+      - sandbox-tag
+    release:
+      - sandbox-tag
 
   - name: openstack-dev/specs-cookiecutter
     check: