diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index bab0245..29dd05d 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -1,7 +1,4 @@
 ---
-#
-# Ansible managed
-#
 
 name: Ansible Molecule
 
@@ -14,81 +11,74 @@ on:
     - cron: '3 2 2 * *'
 
 jobs:
+
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: ansible-lint
         uses: ansible/ansible-lint@main
 
   test:
     needs:
       - lint
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - image: "debian"
-            tag: "latest"
-          - image: "debian"
-            tag: "bullseye"
-          - image: "debian"
-            tag: "buster"
-          - image: "enterpriselinux"
-            tag: "7"
-          - image: "enterpriselinux"
-            tag: "8"
-          - image: "enterpriselinux"
-            tag: "latest"
-          - image: "fedora"
-            tag: "38"
-          - image: "fedora"
-            tag: "39"
-          - image: "opensuse"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "focal"
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          path: "${{ github.repository }}"
-
-      - name: disable apparmor for mysql
-        run: sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-
-      - name: parse apparmor for mysql
-        run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-
-      - name: molecule
-        uses: robertdebock/molecule-action@6.0.0
-        with:
-          image: ${{ matrix.config.image }}
-          tag: ${{ matrix.config.tag }}
-          scenario: default
+    uses: adfinis/github-workflows-bareos/.github/workflows/molecule.yaml@v0.5.1
+    with:
+      systems: |
+        {
+          "config": [
+            {
+              "image": "debian",
+              "tag": "latest"
+            },
+            {
+              "image": "debian",
+              "tag": "bullseye"
+            },
+            {
+              "image": "enterpriselinux",
+              "tag": "8"
+            },
+            {
+              "image": "enterpriselinux",
+              "tag": "latest"
+            },
+            {
+              "image": "fedora",
+              "tag": "40"
+            },
+            {
+              "image": "fedora",
+              "tag": "latest"
+            },
+            {
+              "image": "ubuntu",
+              "tag": "jammy"
+            },
+            {
+              "image": "ubuntu",
+              "tag": "latest"
+            }
+          ]
+        }
 
   test_postgresql:
     needs:
       - lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         config:
-          - image: "debian11"
           - image: "debian12"
-          - image: "fedora38"
-          # TODO 39 not yet supported by geerlingguy.postgresql
-          # - image: "fedora39"
+          - image: "fedora40"
           - image: "ubuntu2204"
+          - image: "ubuntu2404"
           - image: "rockylinux9"
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "${{ github.repository }}"