diff --git a/ansible-requirements.txt b/ansible-requirements.txt
index fd0561fd4..505f71010 100644
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
@@ -1,4 +1,4 @@
 ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0
 metalsmith>=0.13.0 # Apache-2.0
-importlib-metadata<2.0.0
+importlib-metadata
 jsonschema  # MIT
diff --git a/constraints.txt b/constraints.txt
deleted file mode 100644
index 47a7105fb..000000000
--- a/constraints.txt
+++ /dev/null
@@ -1 +0,0 @@
--e git+https://github.com/openstack/tripleo-common@master#egg=tripleo-common
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index cd8117ed4..16f6340ab 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -1,7 +1,7 @@
 # this is required for the molecule jobs
 ansi2html
 # https://github.com/sqlalchemy/dogpile.cache/issues/178 (openstacksdk)
-dogpile.cache>=0.6.5,<0.9.1  # MIT
+dogpile.cache>=0.6.5,!=0.9.1  # MIT
 openstacksdk
 pytest
 pytest-cov
diff --git a/tox.ini b/tox.ini
index d4a0640e7..0e55fd47d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipdist = True
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -c{toxinidir}/constraints.txt {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} {opts} {packages}
 passenv = *
 setenv =
   VIRTUAL_ENV={envdir}
@@ -51,7 +51,7 @@ setenv =
   UPPER_CONSTRAINTS_FILE=file:///dev/null
 deps =
     pre-commit
-    virtualenv<20  # known to break things
+    virtualenv
     -r  {toxinidir}/ansible-requirements.txt
 commands =
     bash -c "ANSIBLE_ROLES_PATH='{toxinidir}/tripleo_ansible/roles.galaxy' \
@@ -71,11 +71,6 @@ basepython = python3
 deps =
   -r {toxinidir}/doc/requirements.txt
 commands=
-    # NOTE(cloudnull): This will ensure we always have the latest version of
-    #                  tripleo-common installed, which is required for documentation
-    #                  to build when running with in development modules which use
-    #                  tripleo-common as a library.
-    pip install tripleo-common -c{toxinidir}/constraints.txt --force --upgrade
     doc8 doc
     sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html -T
 
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index dc386a8a1..b6254a33d 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -6,6 +6,9 @@
     - openstack-python3-ussuri-jobs
     check:
       jobs:
+      - tripleo-ci-centos-8-content-provider:
+          irrelevant-files:
+          - ^tox.ini$
       - openstack-tox-linters: &tripleo-linters
           nodeset: centos-8
       - openstack-tox-docs: &tripleo-docs
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 414ee5901..a9656ca2d 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -200,8 +200,6 @@
 - job:
     files:
     - ^tripleo_ansible/ansible_plugins/.*$
-    - ^tox.ini
-    - ^molecule-requirements.txt
     name: tripleo-ansible-centos-8-molecule-tripleo-modules
     parent: tripleo-ansible-centos-8-base
 - job: