diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 9e2dbef4c7..cd53879da5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -873,6 +873,31 @@
           $WORKSPACE/devstack-gate/devstack-vm-reap.py {provider} $ALL_SERVERS $ALL_IMAGES
 
 
+- job-template:
+    name: devstack-check-vms-{provider}
+    concurrent: false
+    node: devstack-launch
+
+    wrappers:
+      - timeout:
+          timeout: 25
+          fail: true
+      - timestamps
+
+    triggers:
+      - timed: '*/30 * * * *'
+
+    builders:
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+
+          export STATSD_HOST="graphite.openstack.org"
+          export STATSD_PORT=8125
+          export PYTHONUNBUFFERED=true
+          $WORKSPACE/devstack-gate/devstack-vm-check.py {provider}
+
+
 - job-template:
     name: devstack-update-vm-image-{provider}
     concurrent: false
@@ -900,4 +925,5 @@
     jobs:
       - devstack-launch-vms-{provider}
       - devstack-reap-vms-{provider}
+      - devstack-check-vms-{provider}
       - devstack-update-vm-image-{provider}