diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index d3e4adf9f0..657cdf6a0c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1037,7 +1037,8 @@
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: ''
           branch-override: default
-      - 'periodic-swift-dsvm-functional{branch-designator}':
+      - '{pipeline}-swift-dsvm-functional{branch-designator}':
+          pipeline: periodic
           node: 'devstack-precise || devstack-precise-check'
           branch-designator: '-havana'
           branch-override: stable/havana
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
index a292df3e5a..9468f3e209 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/swift-functional.yaml
@@ -36,42 +36,3 @@
     publishers:
       - devstack-logs
       - console-log
-
-
-- job-template:
-    name: 'periodic-swift-dsvm-functional{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - timeout:
-          timeout: 125
-          fail: true
-      - timestamps
-
-    builders:
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export ZUUL_BRANCH={branch-override}
-
-          function post_test_hook {{
-              cd /opt/stack/new/swift
-              # Launch V2 auth tests and v1 tests after.
-              bash .functests --verbosity=3 && \
-                  SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      bash .functests --verbosity=3
-          }}
-          export -f post_test_hook
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-      - link-logs
-
-    publishers:
-      - devstack-logs-periodic
-      - console-log-periodic
-      - email:
-          recipients: openstack-qa@lists.openstack.org