diff --git a/.zuul.yaml b/.zuul.yaml
index 1798d02da0..23373233e0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -56,30 +56,6 @@
         - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
         - tripleo-ci-centos-7-scenario004-standalone
 
-- job:
-    name: manila-grenade
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/grenade-dsvm-manila/run.yaml
-    post-run: playbooks/legacy/grenade-dsvm-manila/post.yaml
-    timeout: 10800
-    irrelevant-files:
-      - ^(test-|)requirements.txt$
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^doc/.*$
-      - ^manila/hacking/.*$
-      - ^manila/tests/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
-    required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/manila-tempest-plugin
-
 - job:
     name: manila-tempest-base
     parent: legacy-dsvm-base
@@ -97,6 +73,19 @@
       - ^tools/.*$
       - ^tox.ini$
 
+- job:
+    name: manila-grenade
+    parent: manila-tempest-base
+    run: playbooks/legacy/grenade-dsvm-manila/run.yaml
+    post-run: playbooks/legacy/grenade-dsvm-manila/post.yaml
+    timeout: 10800
+    required-projects:
+      - openstack-dev/grenade
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/python-manilaclient
+      - openstack/manila-tempest-plugin
+
 - job:
     name: manila-tempest-dsvm-container-scenario-custom-image
     parent: manila-tempest-base
diff --git a/playbooks/legacy/grenade-dsvm-manila/post.yaml b/playbooks/legacy/grenade-dsvm-manila/post.yaml
index e07f5510ae..e9b9d7f3a6 100644
--- a/playbooks/legacy/grenade-dsvm-manila/post.yaml
+++ b/playbooks/legacy/grenade-dsvm-manila/post.yaml
@@ -1,4 +1,4 @@
-- hosts: primary
+- hosts: controller
   tasks:
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
diff --git a/playbooks/legacy/grenade-dsvm-manila/run.yaml b/playbooks/legacy/grenade-dsvm-manila/run.yaml
index d91c7c3ae8..a6c278fd10 100644
--- a/playbooks/legacy/grenade-dsvm-manila/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-manila/run.yaml
@@ -38,6 +38,8 @@
           # Basic services needed for grenade manila job using dummy driver
           export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
 
+          export DEVSTACK_GATE_USE_PYTHON3=True
+
           # Enable manila grenade plugin. Provided repo should be
           # cloned by zuul before devstack run and below provided
           # link should not be used.