diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
index db56171d2..e451af22b 100644
--- a/.github/workflows/agent.yml
+++ b/.github/workflows/agent.yml
@@ -4,11 +4,13 @@ on:
     paths:
       - 'roles/zabbix_agent/**'
       - 'molecule/zabbix_agent/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/agent.yml'
   pull_request:
     paths:
       - 'roles/zabbix_agent/**'
       - 'molecule/zabbix_agent/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/agent.yml'
 jobs:
   molecule:
diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
index 37a190696..30b838e1a 100644
--- a/.github/workflows/javagateway.yml
+++ b/.github/workflows/javagateway.yml
@@ -4,11 +4,13 @@ on:
     paths:
       - 'roles/zabbix_javagateway/**'
       - 'molecule/zabbix_javagateway/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/javagateway.yml'
   pull_request:
     paths:
       - 'roles/zabbix_javagateway/**'
       - 'molecule/zabbix_javagateway/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/javagateway.yml'
 jobs:
   molecule:
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index a819e6c50..bb194a9d6 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -4,11 +4,13 @@ on:
     paths:
       - 'roles/zabbix_proxy/**'
       - 'molecule/zabbix_proxy/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/proxy.yml'
   pull_request:
     paths:
       - 'roles/zabbix_proxy/**'
       - 'molecule/zabbix_proxy/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/proxy.yml'
 jobs:
   molecule:
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index dd64bd53c..347d14243 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -4,11 +4,13 @@ on:
     paths:
       - 'roles/zabbix_server/**'
       - 'molecule/zabbix_server/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/server.yml'
   pull_request:
     paths:
       - 'roles/zabbix_server/**'
       - 'molecule/zabbix_server/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/server.yml'
 jobs:
   molecule:
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index aa5b3cde2..f34f0b6b7 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -4,11 +4,13 @@ on:
     paths:
       - 'roles/zabbix_web/**'
       - 'molecule/zabbix_web/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/web.yml'
   pull_request:
     paths:
       - 'roles/zabbix_web/**'
       - 'molecule/zabbix_web/**'
+      - 'molecule/requirements.txt'
       - '.github/workflows/web.yml'
 jobs:
   molecule:
diff --git a/molecule/requirements.txt b/molecule/requirements.txt
index 416ea89de..8ed19f2d6 100644
--- a/molecule/requirements.txt
+++ b/molecule/requirements.txt
@@ -1,10 +1,11 @@
 # Install CI dependencies for the Zabbix Roles
-ansible==2.9.11
-ansible-lint==4.2.0
-docker==4.2.1
-molecule==3.0.4
-netaddr==0.7.19
-testinfra==5.2.1
+ansible==2.10.4
+ansible-lint==4.3.7
+docker==4.3.1
+molecule==3.2.1
+molecule-docker==0.2.4
+netaddr==0.8.0
+pytest-testinfra==6.1.0
 zabbix-api==0.5.4
 ipaddr==2.2.0
 ipaddress==1.0.23
diff --git a/requirements-roles.yml b/requirements-roles.yml
deleted file mode 100644
index 0eeeec74e..000000000
--- a/requirements-roles.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-roles:
-- src: geerlingguy.apache