diff --git a/.zuul.yaml b/.zuul.yaml
index d25625d67..21a4a538f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -77,17 +77,42 @@
 
 - job:
     name: designate-grenade-pdns4
-    parent: legacy-dsvm-base
+    parent: grenade
     required-projects:
-      - openstack/grenade
-      - openstack/devstack-gate
-      - openstack/designate
-      - openstack/designate-dashboard
-      - openstack/designate-tempest-plugin
-      - openstack/python-designateclient
-    run: playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
-    post-run: playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
-    timeout: 10800
+      - opendev.org/openstack/horizon
+      - opendev.org/openstack/designate
+      - opendev.org/openstack/designate-dashboard
+      - opendev.org/openstack/designate-tempest-plugin
+      - opendev.org/openstack/python-designateclient
+    post-run: playbooks/designate-pdns4/post.yaml
+    vars:
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate
+      devstack_services:
+        designate: true
+        designate-api: true
+        designate-central: true
+        designate-producer: true
+        designate-worker: true
+        designate-mdns: true
+        designate-agent: true
+        designate-sink: true
+        horizon: true
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        c-bak: false
+      grenade_devstack_localrc:
+        shared:
+          DESIGNATE_BACKEND_DRIVER: pdns4
+          DESIGNATE_SERVICE_PORT_DNS: 5322
+      grenade_localrc:
+        BASE_RUN_SMOKE: False
+      tox_envlist: all
+      tempest_plugins:
+        - designate-tempest-plugin
+      tempest_test_regex: designate_tempest_plugin(?!\.tests.api.v1).*
     irrelevant-files:
       - ^.*\.rst$
       - ^api-ref/.*$
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 713285615..31b06eedb 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -85,7 +85,7 @@ function create {
 
     resource_save designate zone_id $id
 
-    eval $(openstack recordset create --records $DESIGNATE_RRSET_RECORD \
+    eval $(openstack recordset create --record $DESIGNATE_RRSET_RECORD \
         --type $DESIGNATE_RRSET_TYPE \
         $DESIGNATE_ZONE_NAME \
         $DESIGNATE_RRSET_NAME \
diff --git a/playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
deleted file mode 100644
index 7d10569f0..000000000
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-grenade-dsvm-designate-pdns4 from old job gate-grenade-dsvm-designate-pdns4-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          DESIGNATE_SERVICE_PORT_DNS=5322
-          DESIGNATE_BACKEND_DRIVER=pdns4
-          TEMPEST_PLUGINS=' ../designate-tempest-plugin'
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_GRENADE=pullup
-          export DEVSTACK_GATE_TEMPEST_REGEX="designate_tempest_plugin(?!\.tests.api.v1).*"
-          export DEVSTACK_GATE_HORIZON=1
-          export DEVSTACK_GATE_USE_PYTHON3=True
-
-          export PROJECTS="openstack/designate $PROJECTS"
-          export PROJECTS="openstack/python-designateclient $PROJECTS"
-          export PROJECTS="openstack/designate-dashboard $PROJECTS"
-          export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/grenade $PROJECTS"
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export GRENADE_PLUGINRC="enable_grenade_plugin designate https://opendev.org/openstack/designate"
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'