diff --git a/.zuul.yaml b/.zuul.yaml
index 9136e63c..a888c819 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,11 +9,7 @@
         - openstack-tox-linters
         - py3-bandit
         - py3-flake8
-        - patch-tox-pylint
-        - patch-tox-py27
-        - patch-tox-py39
         - patch-alarm-tox-pylint
-        - patch-alarm-tox-py27
         - patch-alarm-tox-py39
         - sw-patch-tox-pylint
         - sw-patch-tox-py39
@@ -22,11 +18,7 @@
         - openstack-tox-linters
         - py3-bandit
         - py3-flake8
-        - patch-tox-pylint
-        - patch-tox-py27
-        - patch-tox-py39
         - patch-alarm-tox-pylint
-        - patch-alarm-tox-py27
         - patch-alarm-tox-py39
         - sw-patch-tox-pylint
         - sw-patch-tox-py39
@@ -51,46 +43,6 @@
     vars:
       tox_envlist: flake8
 
-- job:
-    name: patch-tox-pylint
-    parent: tox
-    nodeset: ubuntu-bionic
-    required-projects:
-      - starlingx/config
-      - starlingx/fault
-    files:
-      - cgcs-patch/cgcs-patch/*
-    vars:
-      tox_envlist: pylint
-      tox_extra_args: -c cgcs-patch/cgcs-patch/tox.ini
-
-- job:
-    name: patch-tox-py27
-    parent: tox
-    nodeset: ubuntu-xenial
-    required-projects:
-      - starlingx/config
-      - starlingx/fault
-    files:
-      - cgcs-patch/cgcs-patch/*
-    vars:
-      tox_envlist: py27
-      tox_extra_args: -c cgcs-patch/cgcs-patch/tox.ini
-
-- job:
-    name: patch-tox-py39
-    parent: tox-py39
-    nodeset: debian-bullseye
-    required-projects:
-      - starlingx/config
-      - starlingx/fault
-    files:
-      - cgcs-patch/cgcs-patch/*
-    vars:
-      tox_envlist: py39
-      python_version: 3.9
-      tox_extra_args: -c cgcs-patch/cgcs-patch/tox.ini
-
 - job:
     name: sw-patch-tox-py39
     parent: tox-py39
@@ -123,7 +75,7 @@
 - job:
     name: patch-alarm-tox-pylint
     parent: tox
-    nodeset: ubuntu-xenial
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -133,19 +85,6 @@
       tox_envlist: pylint
       tox_extra_args: -c patch-alarm/patch-alarm/tox.ini
 
-- job:
-    name: patch-alarm-tox-py27
-    parent: tox
-    nodeset: ubuntu-xenial
-    required-projects:
-      - starlingx/config
-      - starlingx/fault
-    files:
-      - patch-alarm/patch-alarm/*
-    vars:
-      tox_envlist: py27
-      tox_extra_args: -c patch-alarm/patch-alarm/tox.ini
-
 - job:
     name: patch-alarm-tox-py39
     parent: tox-py39
diff --git a/cgcs-patch/cgcs-patch/tox.ini b/cgcs-patch/cgcs-patch/tox.ini
index b66dd396..fc2a2dc6 100644
--- a/cgcs-patch/cgcs-patch/tox.ini
+++ b/cgcs-patch/cgcs-patch/tox.ini
@@ -40,7 +40,7 @@ deps = -r{toxinidir}/requirements.txt
        -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
        -e{[tox]stxdir}/config/tsconfig/tsconfig
 
-whitelist_externals = find
+allowlist_externals = find
                       sh
 
 [testenv:stestr]
diff --git a/patch-alarm/patch-alarm/tox.ini b/patch-alarm/patch-alarm/tox.ini
index 8b12a3a7..316c189d 100644
--- a/patch-alarm/patch-alarm/tox.ini
+++ b/patch-alarm/patch-alarm/tox.ini
@@ -41,7 +41,7 @@ deps = -r{toxinidir}/requirements.txt
        -e{[tox]stxdir}/config/tsconfig/tsconfig
        -e{[tox]stxdir}/update/cgcs-patch/cgcs-patch
 
-whitelist_externals = find
+allowlist_externals = find
                       sh
 
 [testenv:stestr]
diff --git a/sw-patch/cgcs-patch/tox.ini b/sw-patch/cgcs-patch/tox.ini
index 7f3fad39..675ecc96 100644
--- a/sw-patch/cgcs-patch/tox.ini
+++ b/sw-patch/cgcs-patch/tox.ini
@@ -41,7 +41,7 @@ setenv = VIRTUAL_ENV={envdir}
 
 sitepackages = False
 usedevelop = true
-whitelist_externals = find
+allowlist_externals = find
                       sh
 
 [testenv:stestr]
diff --git a/tox.ini b/tox.ini
index 40d0fccd..595ac211 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,11 +44,11 @@ deps = -r{toxinidir}/requirements.txt
        -e{[testenv]cgcs_patch_dir}
        -e{[testenv]patch_alarm_dir}
 
-whitelist_externals = find
+allowlist_externals = find
 
 [testenv:linters]
 basepython = python3
-whitelist_externals = bash
+allowlist_externals = bash
 commands =
     bash -c "find {toxinidir}          \
          -not \( -type d -name .?\* -prune \) \
@@ -96,7 +96,7 @@ max-line-length = 120
 
 [testenv:flake8]
 basepython = python3
-whitelist_externals = cp
+allowlist_externals = cp
                       find
                       tox
 recreate = True
@@ -117,7 +117,7 @@ verbosity=2
 [testenv:py27]
 basepython = python2.7
 deps = {[testenv]deps}
-whitelist_externals = cp
+allowlist_externals = cp
                       find
                       tox
 recreate = True
@@ -129,7 +129,7 @@ commands = {[testenv]commands}
 [testenv:py36]
 basepython = python3
 deps = {[testenv]deps}
-whitelist_externals = cp
+allowlist_externals = cp
                       find
                       tox
 recreate = True
@@ -167,7 +167,7 @@ commands = bandit --ini tox.ini -r {toxinidir}/ -x '**/.tox/**,**/.eggs/**' -lll
 
 [testenv:pylint]
 basepython = python3
-whitelist_externals = cp
+allowlist_externals = cp
                       find
                       tox
 recreate = True
@@ -179,7 +179,7 @@ commands = {[testenv]commands}
 [testenv:cover]
 basepython = python3
 deps = {[testenv]deps}
-whitelist_externals = cp
+allowlist_externals = cp
                       find
                       tox
 recreate = True
@@ -194,7 +194,7 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build
     sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:releasenotes]
 basepython = python3
@@ -202,7 +202,7 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf releasenotes/build
     sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-whitelist_externals =
+allowlist_externals =
     rm
     reno
 
@@ -220,7 +220,7 @@ deps =
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if