diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 61a44a1..dc472c4 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           path: "${{ github.repository }}"
       - name: molecule
-        uses: robertdebock/molecule-action@2.7.2
+        uses: robertdebock/molecule-action@master
         with:
           command: lint
   test:
@@ -63,7 +63,7 @@ jobs:
       - name: parse apparmor for mysql
         run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
       - name: molecule
-        uses: robertdebock/molecule-action@2.7.2
+        uses: robertdebock/molecule-action@master
         with:
           image: ${{ matrix.config.image }}
           tag: ${{ matrix.config.tag }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50682e9..0d5b317 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 ---
-image: "robertdebock/github-action-molecule:3.3.1"
+image: "robertdebock/github-action-molecule"
 
 services:
   - docker:dind
@@ -10,6 +10,7 @@ variables:
 
 molecule:
   script:
+    - test -f requirements.yml && ansible-galaxy install -r requirements.yml
     - image=${image} tag=${tag} molecule test
   rules:
     - if: $CI_COMMIT_REF_NAME == "master"
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
deleted file mode 100644
index b869f41..0000000
--- a/molecule/default/collections.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-collections:
-  - name: community.docker
-  - name: community.general
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 82ca7e6..2ba1e72 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -6,6 +6,7 @@ dependency:
   name: galaxy
   options:
     role-file: requirements.yml
+    requirements-file: requirements.yml
 lint: |
   set -e
   yamllint .
diff --git a/tox.ini b/tox.ini
index c1ade81..ec037c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,15 +3,15 @@
 #
 [tox]
 minversion = 3.21.4
-envlist = py{39}-ansible-{2.9,2.10,2.11}
+envlist = py{310}-ansible-{2.10,2.11,2.12}
 
 skipsdist = true
 
 [testenv]
 deps =
-    2.9: ansible == 2.9.*
     2.10: ansible-base == 2.10.*
     2.11: ansible-core == 2.11.*
+    2.12: ansible-core == 2.12.*
     molecule[docker]
     docker == 4.*
     ansible-lint == 5.*