diff --git a/.github/workflows/ansible_molecule_teststing.yml b/.github/workflows/ansible_molecule_teststing.yml
index e258f46..85a32cd 100644
--- a/.github/workflows/ansible_molecule_teststing.yml
+++ b/.github/workflows/ansible_molecule_teststing.yml
@@ -16,7 +16,8 @@ concurrency:
 env:
   PREINSTALL_MOLECULE_REQUIREMENTS: 'false'
   PREINSTALL_MOLECULE_REQUIREMENTS_YAML_PATH: roles/requirements.yml
-  PREINSTALL_MOLECULE_REQUIREMENTS_SERVER: https://old-galaxy.ansible.com
+  ANSIBLE_GALAXY_SERVER_TIMEOUT: 300
+  ANSIBLE_GALAXY_SERVER_LIST: https://old-galaxy.ansible.com, https://galaxy.ansible.com
 
 jobs:
   test_bareos:
@@ -73,8 +74,7 @@ jobs:
           echo "VERB_OPT: $VERB_OPT"
           set -x
           if $PREINSTALL_MOLECULE_REQUIREMENTS && [[ -f "$PREINSTALL_MOLECULE_REQUIREMENTS_YAML_PATH" ]]; then
-            poetry --ansi run ansible-galaxy install -r "$PREINSTALL_MOLECULE_REQUIREMENTS_YAML_PATH" \
-              --server "$PREINSTALL_MOLECULE_REQUIREMENTS_SERVER" --timeout 300 $VERB_OPT
+            poetry --ansi run ansible-galaxy install -r "$PREINSTALL_MOLECULE_REQUIREMENTS_YAML_PATH" $VERB_OPT
           fi
           cd roles/bareos
           poetry --ansi run molecule $DEBUG_OPT $VERB_OPT test
diff --git a/roles/bareos/molecule/default/molecule.yml b/roles/bareos/molecule/default/molecule.yml
index 6e8cbf9..1134785 100644
--- a/roles/bareos/molecule/default/molecule.yml
+++ b/roles/bareos/molecule/default/molecule.yml
@@ -7,9 +7,7 @@ dependency:
     ignore-errors: true
 # To switch on old Ansible Galaxy API (ansible < 2.13.5):
 # https://forum.ansible.com/t/os-builds-failing-skipping-galaxy-server-https-galaxy-ansible-com-api/1408/9
-  env:
-    ANSIBLE_GALAXY_SERVER_TIMEOUT: 300
-    ANSIBLE_GALAXY_SERVER_LIST: https://old-galaxy.ansible.com, https://galaxy.ansible.com
+# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
 driver:
   name: docker
 platforms: