diff --git a/.zuul.yaml b/.zuul.yaml
index 51e9d77b9..a60454cc1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -102,7 +102,7 @@
     parent: tox
     description: |
       Run pep8 tests for k8sapp_openstack
-    nodeset: ubuntu-bionic
+    nodeset: debian-bullseye
     required-projects:
       - starlingx/config
       - starlingx/fault
diff --git a/python3-k8sapp-openstack/k8sapp_openstack/tox.ini b/python3-k8sapp-openstack/k8sapp_openstack/tox.ini
index b7d53c1d3..2ec6175c2 100644
--- a/python3-k8sapp-openstack/k8sapp_openstack/tox.ini
+++ b/python3-k8sapp-openstack/k8sapp_openstack/tox.ini
@@ -96,13 +96,12 @@ import-order-style = google
 application-import-names = k8sapp_openstack
 
 [testenv:pep8]
-basepython = python3.6
 deps = -r{toxinidir}/test-requirements.txt
        flake8-bugbear
-       flake8-import-order~=0.18.2 # 0.19.* doesn't work with python 3.7 and 3.8 -> https://github.com/PyCQA/flake8-import-order/issues/210
+       flake8-import-order~=0.19.2
 install_command = pip install -v -v -v \
     -c{toxinidir}/upper-constraints.txt \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/tag/stein-eol/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}
 commands =
   flake8 {posargs} .