diff --git a/.zuul.yaml b/.zuul.yaml
index 13c7579..6d3470f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,6 @@
     check:
       jobs:
         - openstack-tox-linters
-        - k8sapp-oidc-tox-py27
         - k8sapp-oidc-tox-py39
         - k8sapp-oidc-tox-flake8
         - k8sapp-oidc-tox-pylint
@@ -13,7 +12,6 @@
     gate:
       jobs:
         - openstack-tox-linters
-        - k8sapp-oidc-tox-py27
         - k8sapp-oidc-tox-py39
         - k8sapp-oidc-tox-flake8
         - k8sapp-oidc-tox-pylint
@@ -22,23 +20,6 @@
       jobs:
         - stx-oidc-auth-armada-app-upload-git-mirror
 
-- job:
-    name: k8sapp-oidc-tox-py27
-    parent: tox
-    description: |
-      Run py27 test for k8sapp_oidc
-    nodeset: ubuntu-xenial
-    required-projects:
-      - starlingx/config
-      - starlingx/fault
-      - starlingx/update
-      - starlingx/utilities
-    files:
-      - python-k8sapp-oidc/*
-    vars:
-      tox_envlist: py27
-      tox_extra_args: -c python-k8sapp-oidc/k8sapp_oidc/tox.ini
-
 - job:
     name: k8sapp-oidc-tox-py39
     parent: tox-py39
@@ -63,7 +44,7 @@
     parent: tox
     description: |
       Run flake8 test for k8sapp_oidc
-    nodeset: ubuntu-focal
+    nodeset: debian-bullseye
     files:
       - python-k8sapp-oidc/*
     vars:
@@ -75,7 +56,7 @@
     parent: tox
     description: |
       Run pylint test for k8sapp_oidc
-    nodeset: ubuntu-bionic
+    nodeset: debian-bullseye
     required-projects:
       - starlingx/config
       - starlingx/fault
@@ -92,7 +73,7 @@
     parent: tox
     description: |
       Run bandit test for k8sapp_oidc
-    nodeset: ubuntu-focal
+    nodeset: debian-bullseye
     files:
       - python-k8sapp-oidc/*
     vars:
diff --git a/oidc-auth-tools/oidcauthtools/setup.cfg b/oidc-auth-tools/oidcauthtools/setup.cfg
index 271e538..84de9d9 100644
--- a/oidc-auth-tools/oidcauthtools/setup.cfg
+++ b/oidc-auth-tools/oidcauthtools/setup.cfg
@@ -8,8 +8,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
 
diff --git a/python-k8sapp-oidc/k8sapp_oidc/setup.cfg b/python-k8sapp-oidc/k8sapp_oidc/setup.cfg
index 63c6394..319afbd 100644
--- a/python-k8sapp-oidc/k8sapp_oidc/setup.cfg
+++ b/python-k8sapp-oidc/k8sapp_oidc/setup.cfg
@@ -14,8 +14,6 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
diff --git a/python-k8sapp-oidc/k8sapp_oidc/tox.ini b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
index 8623bf7..a67dada 100644
--- a/python-k8sapp-oidc/k8sapp_oidc/tox.ini
+++ b/python-k8sapp-oidc/k8sapp_oidc/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,py27,py36,py39,pylint,bandit
+envlist = flake8,py36,py39,pylint,bandit
 minversion = 1.6
 skipsdist = True
 
@@ -21,7 +21,7 @@ allowlist_externals = bash
                       find
 
 install_command = pip install \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}
 
 # Note the hash seed is set to 0 until can be tested with a
@@ -65,13 +65,6 @@ deps = -r{toxinidir}/test-requirements.txt
 commands =
   flake8 {posargs} .
 
-[testenv:py27]
-basepython = python2.7
-commands =
-  {[testenv]commands}
-  stestr run {posargs}
-  stestr slowest
-
 [testenv:py36]
 basepython = python3.6
 commands =
@@ -81,9 +74,6 @@ commands =
 
 [testenv:py39]
 basepython = python3.9
-install_command = pip install \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
-    {opts} {packages}
 commands =
   {[testenv]commands}
   stestr run {posargs}
@@ -112,7 +102,7 @@ commands =
     pylint {posargs} k8sapp_oidc --rcfile=./pylint.rc
 
 [testenv:cover]
-basepython = python2.7
+basepython = python3
 deps = {[testenv]deps}
 setenv = {[testenv]setenv}
          PYTHON=coverage run --parallel-mode