diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 25eaf891..95abd694 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -7,9 +7,9 @@
         - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
-        - rally-dsvm-tox-functional
+        #- rally-dsvm-tox-functional
         - rally-openstack-docker-build
-        - rally-task-basic-with-existing-users
+        #- rally-task-basic-with-existing-users
         #- rally-task-simple-job
         - rally-task-barbican:
             files:
@@ -53,7 +53,7 @@
         #- rally-task-monasca
         - rally-task-murano:
             voting: false
-        - rally-task-neutron
+        #- rally-task-neutron
         - rally-task-neutron-trunk:
             files:
               - .zuul.d/zuul.yaml
@@ -67,8 +67,8 @@
               - tests/ci/playbooks
         - rally-task-neutron-with-extensions:
             voting: false
-        - rally-task-nova:
-            voting: false
+        #- rally-task-nova:
+        #    voting: false
         # it did not work for a long time
         #- rally-task-senlin
         #- rally-task-octavia:
@@ -80,7 +80,7 @@
             voting: false
         - rally-task-zaqar:
             voting: false
-        - rally-verify-tempest
+        #- rally-verify-tempest
     gate:
       jobs:
         - rally-tox-cover
@@ -89,9 +89,9 @@
         - rally-tox-py37
         - rally-tox-py38
         - rally-tox-py39
-        - rally-dsvm-tox-functional
+        #- rally-dsvm-tox-functional
         - rally-openstack-docker-build
-        - rally-task-basic-with-existing-users
+        #- rally-task-basic-with-existing-users
         #- rally-task-simple-job
         - rally-task-barbican:
             files:
@@ -107,7 +107,7 @@
         - rally-task-ironic
         - rally-task-keystone-glance-swift
         - rally-task-mistral
-        - rally-task-neutron
+        #- rally-task-neutron
         - rally-task-neutron-trunk:
             files:
               - rally-jobs/neutron-trunk.yaml
@@ -118,7 +118,7 @@
               - rally_openstack/task/scenarios/neutron/trunk.py
               - rally_openstack/task/scenarios/neutron/network.py
               - tests/ci/playbooks
-        - rally-verify-tempest
+        #- rally-verify-tempest
     post:
       jobs:
         - rally-openstack-docker-build-and-push:
diff --git a/requirements.txt b/requirements.txt
index 20400efc..30e58074 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ requests!=2.20.0,!=2.24.0                              # Apache License, Version
 rally>=3.1.0                                           # Apache License, Version 2.0
 
 # OpenStack related
-gnocchiclient!=7.0.7                                   # Apache Software License
+gnocchiclient                                          # Apache Software License
 keystoneauth1                                          # Apache Software License
 kubernetes                                             # Apache License Version 2.0
 os-faults>=0.2.0                                       # Apache Software License
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 3acf1536..5bd22207 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -23,7 +23,7 @@ fasteners===0.14.1
 filelock===3.3.1
 fixtures===3.0.0
 futurist===2.4.0
-gnocchiclient===7.0.6
+gnocchiclient===7.0.7
 google-auth===2.3.0
 greenlet===1.1.2
 idna===3.3