diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f4b0ec220..1679b0569 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: check-added-large-files
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://gitlab.com/pycqa/flake8.git
+  - repo: https://github.com/PyCQA/flake8
     rev: 3.7.8
     hooks:
       - id: flake8
diff --git a/.zuul.yaml b/.zuul.yaml
index 3e9b6b3d4..043e2dfd3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,6 +11,7 @@
     required-projects:
       - jjb/python-jenkins
       - jjb/jenkins-job-builder
+    nodeset: ubuntu-focal
     voting: true
 
 - job:
@@ -23,12 +24,17 @@
     templates:
       - docs-on-readthedocs
       - openstack-python37-jobs-no-constraints
-      - openstack-python38-jobs-no-constraints
     vars:
       rtd_webhook_id: '47271'
     check:
       jobs:
+        - tox-py38:
+            nodeset: ubuntu-focal
         - jjb-tox-linters
         - jjb-tox-cross-python-jenkins
         - jjb-tox-docs-linkcheck
         - tox-cover
+    gate:
+      jobs:
+        - tox-py38:
+            nodeset: ubuntu-focal