diff --git a/infra/azure/azure-pipelines.yml b/infra/azure/azure-pipelines.yml
index 1cf4437b41..7456b62eb4 100644
--- a/infra/azure/azure-pipelines.yml
+++ b/infra/azure/azure-pipelines.yml
@@ -5,9 +5,6 @@ trigger:
 pool:
   vmImage: 'ubuntu-20.04'
 
-variables:
-  groups: "1, 2, 3"
-
 stages:
 
 # Fedora
@@ -48,19 +45,16 @@ stages:
 
 # Galaxy on Fedora
 
-- ${{ each group in split(variables.groups, ', ') }}:
-  - stage: Galaxy_Fedora_Latest
-    dependsOn: []
-    jobs:
-    - template: templates/run_tests.yml
-      parameters:
-        build_number: $(Build.BuildNumber)
-        distro: fedora-latest
-        ansible_version: "-core >=2.16,<2.17"
-        skip_git_test: true
-        test_galaxy: true
-        group_number: ${{ group }}
-        number_of_groups: 3
+- stage: Galaxy_Fedora_Latest
+  dependsOn: []
+  jobs:
+  - template: templates/group_tests.yml
+    parameters:
+      build_number: $(Build.BuildNumber)
+      distro: fedora-latest
+      ansible_version: "-core >=2.16,<2.17"
+      skip_git_test: true
+      test_galaxy: true
 
 # CentOS 9 Stream
 
diff --git a/infra/azure/templates/group_tests.yml b/infra/azure/templates/group_tests.yml
index 89953d4d3c..ccfe2a8f40 100644
--- a/infra/azure/templates/group_tests.yml
+++ b/infra/azure/templates/group_tests.yml
@@ -15,49 +15,19 @@ parameters:
     type: boolean
     default: false
 
-jobs:
-- template: run_tests.yml
-  parameters:
-    group_number: 1
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
-
-- template: run_tests.yml
-  parameters:
-    group_number: 2
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
+variables:
+  groups: "1, 2, 3"
 
-- template: run_tests.yml
-  parameters:
-    group_number: 3
-    number_of_groups: 3
-    build_number: ${{ parameters.build_number }}
-    distro: ${{ parameters.distro }}
-    ansible_version: ${{ parameters.ansible_version }}
-    python_version: '< 3.12'
-    skip_git_test: ${{ parameters.skip_git_test }}
-    test_galaxy: ${{ parameters.test_galaxy }}
+jobs:
 
-# Temporarily disabled due to ansible docker plugin issue.
-# - template: run_tests.yml
-#   parameters:
-#     group_number: 1
-#     number_of_groups: 1
-#     build_number: ${{ parameters.build_number }}
-#     distro: ${{ parameters.distro }}
-#     ansible_version: ${{ parameters.ansible_version }}
-#     python_version: '< 3.12'
-#     skip_git_test: ${{ parameters.skip_git_test }}
-#     test_type: "not playbook"
-#     test_galaxy: ${{ parameters.test_galaxy }}
+- ${{ each group in split(groups, ', ') }}:
+  - template: run_tests.yml
+    parameters:
+      group_number: ${{ group }}
+      number_of_groups: 3
+      build_number: ${{ parameters.build_number }}
+      distro: ${{ parameters.distro }}
+      ansible_version: ${{ parameters.ansible_version }}
+      python_version: '< 3.12'
+      skip_git_test: ${{ parameters.skip_git_test }}
+      test_galaxy: ${{ parameters.test_galaxy }}