diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 8f9d88483c..91d8b5a5c0 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2224,39 +2224,8 @@
       - console-log
 
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 180
-      - timestamps
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_CEPH=1
-
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
+# TODO(mriedem): Add a -src- variant of this job to replace
+# tempest-dsvm-full-ceph-src below.
 - job-template:
     name: '{pipeline}-tempest-dsvm-full-devstack-plugin-ceph{job-suffix}'
     node: '{node}'
@@ -2793,7 +2762,6 @@
       - '{pipeline}-grenade-dsvm{job-suffix}'
       - '{pipeline}-tempest-dsvm-all{job-suffix}'
       - '{pipeline}-tempest-dsvm-cells{job-suffix}'
-      - '{pipeline}-tempest-dsvm-full-ceph{job-suffix}'
       - '{pipeline}-tempest-dsvm-full-lio{job-suffix}'
       - '{pipeline}-tempest-dsvm-full-test-accounts{job-suffix}'
       - '{pipeline}-tempest-dsvm-full{job-suffix}'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5ab7095823..62893f742a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2130,8 +2130,8 @@ jobs:
     # NOTE(flaper87): Disable job in Kilo until we fix the gate.
     branch: ^(?!stable/kilo).*$
 
-  # NOTE(mriedem): Make the ceph jobs voting again after bug 1551305 is fixed.
-  - name: ^gate-tempest-dsvm-full-ceph.*$
+  # NOTE(mriedem): Replace this with a src job using the ceph dsvm plugin
+  - name: ^gate-tempest-dsvm-full-ceph-src-.*$
     voting: false
 
   - name: gate-kolla-dsvm-build-centos-binary
@@ -2549,7 +2549,6 @@ projects:
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-platform-centos7-neutron
       - gate-tempest-dsvm-platform-centos7-minimal
-      - gate-tempest-dsvm-full-ceph
     periodic:
       - propose-devstack-plugins-list
       - periodic-tempest-dsvm-oslo-latest-full-master
@@ -4570,7 +4569,6 @@ projects:
     check:
       - gate-cinder-pylint
       - gate-rally-dsvm-cinder
-      - gate-tempest-dsvm-full-ceph
       - gate-tempest-dsvm-full-devstack-plugin-ceph-nv
       - gate-cinder-dsvm-apache
       - gate-cinder-tox-db-functional
@@ -5965,7 +5963,6 @@ projects:
       - name: translation-jobs-mitaka
       - name: release-notes-jobs
     check:
-      - gate-tempest-dsvm-full-ceph
       - gate-tempest-dsvm-full-devstack-plugin-ceph-nv
       - gate-rally-dsvm-glance
     experimental:
@@ -5991,8 +5988,10 @@ projects:
       - name: publish-to-pypi
       - name: lib-forward-testing
     check:
+      # TODO(mriedem): Switch to gate-tempest-dsvm-full-devstack-plugin-ceph
       - gate-tempest-dsvm-full-ceph-src-glance_store
     gate:
+      # TODO(mriedem): Switch to gate-tempest-dsvm-full-devstack-plugin-ceph
       - gate-tempest-dsvm-full-ceph-src-glance_store
     experimental:
       - gate-glance_store-dsvm-functional-filesystem
@@ -7454,7 +7453,6 @@ projects:
       - gate-grenade-dsvm-multinode
       - gate-tempest-dsvm-ironic-pxe_ipa-nv
       - gate-tempest-dsvm-cells
-      - gate-tempest-dsvm-full-ceph
       - gate-tempest-dsvm-full-devstack-plugin-ceph-nv
       - gate-tempest-dsvm-multinode-full
       - gate-nova-api-guide
@@ -8000,6 +7998,7 @@ projects:
       - name: lib-forward-testing
       - name: release-notes-jobs
     check:
+      # TODO(mriedem): Switch to gate-tempest-dsvm-full-devstack-plugin-ceph
       - gate-tempest-dsvm-full-ceph-src-os-brick
       - gate-tempest-dsvm-full-lio-src-os-brick
     gate: