diff --git a/bindep.txt b/bindep.txt
index e89007d70..317a8b4b9 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -18,12 +18,14 @@ gcc-c++           [platform:rpm]
 git               [platform:rpm]
 libffi-devel      [platform:rpm]
 openssl-devel     [platform:rpm]
-python-devel      [platform:rpm]
-python2-dnf       [platform:fedora]
+python-devel      [(platform:rpm platform:base-py2)]
+python2-dnf       [(platform:rpm platform:base-py2)]
 
 # For SELinux
-libselinux-python  [platform:rpm]
-libsemanage-python [platform:redhat]
+libselinux-python  [(platform:rpm platform:base-py2)]
+python3-libselinux  [(platform:rpm platform:base-py3)]
+libsemanage-python [(platform:rpm platform:base-py2)]
+python3-libsemanage-python [(platform:rpm platform:base-py3)]
 
 # Required for compressing collected log files in CI
 gzip
diff --git a/tox.ini b/tox.ini
index de8d3aad4..3f45d8ab5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.8
-envlist = linters,py38
+envlist = linters,py
 skipsdist = True
 
 # Automatic envs will only use the python version appropriate to that
diff --git a/tripleo_common/image/base.py b/tripleo_common/image/base.py
index c9656a7de..4f6ed2fc1 100644
--- a/tripleo_common/image/base.py
+++ b/tripleo_common/image/base.py
@@ -55,7 +55,7 @@ class BaseImageManager(object):
                     data = yaml.safe_load(cf.read()).get(section)
                     if not data:
                         return None
-                    self.logger.debug('%s JSON: %s', (section, str(data)))
+                    self.logger.debug('%s JSON: %s', section, str(data))
                 for item in data:
                     image_name = item.get('imagename')
                     if image_name is None:
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 221a8525a..5fbbc7b9c 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -19,6 +19,7 @@
         - openstack-tox-py36
         - openstack-tox-py37
         - openstack-tox-py38
+        - openstack-tox-py39
         - tripleo-cross-tripleoclient-py37
         - tripleo-ci-centos-8-content-provider:
             dependencies: &deps_unit_lint
@@ -26,6 +27,7 @@
               - openstack-tox-py36
               - openstack-tox-py37
               - openstack-tox-py38
+              - openstack-tox-py39
         - tripleo-buildimage-overcloud-full-centos-8:
             dependencies: *deps_unit_lint
         - tripleo-buildimage-ironic-python-agent-centos-8: