diff --git a/molecule/c8s-build/molecule.yml b/molecule/c8s-build/molecule.yml
index 86d5d61049455d3b3a2b555d2f0fc8535ed6a471..8855215190e13f2f6f7b535385cc07b4284d46e9 100644
--- a/molecule/c8s-build/molecule.yml
+++ b/molecule/c8s-build/molecule.yml
@@ -16,3 +16,4 @@ provisioner:
   name: ansible
   playbooks:
     prepare: ../resources/playbooks/prepare-build.yml
+prerun: false
diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index d188fd54c7a3c4adb45c45ab4f7155f7c42d7914..199cf8e98ed20616a3028129e67191e1006c7ef4 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -40,16 +40,16 @@ stages:
       scenario: c8s
       ansible_version: ">=2.9,<2.10"
 
-# CentOS 8
-
-- stage: CentOS8_Ansible_2_9
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: centos-8
-      ansible_version: ">=2.9,<2.10"
+# # CentOS 8
+#
+# - stage: CentOS8_Ansible_2_9
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-8
+#       ansible_version: ">=2.9,<2.10"
 
 # CentOS 7
 
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 9bdc5521b22acc0f1bc491b5894892a9eddecfb3..000b542c0e0aa4f27fc4ba3ab91d2b8a588742ce 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -21,11 +21,11 @@ jobs:
     container_name: centos-7
     build_scenario_name: centos-7-build
 
-- template: templates/build_container.yml
-  parameters:
-    job_name_suffix: Centos8
-    container_name: centos-8
-    build_scenario_name: centos-8-build
+# - template: templates/build_container.yml
+#   parameters:
+#     job_name_suffix: Centos8
+#     container_name: centos-8
+#     build_scenario_name: centos-8-build
 
 - template: templates/build_container.yml
   parameters:
diff --git a/tests/azure/nightly.yml b/tests/azure/nightly.yml
index 9c17a6f92f77d3ed2fc14c372aea5f33b6d2c847..ef97ed9998537d36c3fad63af42ba22941ea2821 100644
--- a/tests/azure/nightly.yml
+++ b/tests/azure/nightly.yml
@@ -119,43 +119,43 @@ stages:
       scenario: c8s
       ansible_version: ""
 
-# CentOS 8
-
-- stage: CentOS8_Ansible_2_9
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: centos-8
-      ansible_version: ">=2.9,<2.10"
-
-- stage: CentOS8_Ansible_Core_2_11
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: centos-8
-      ansible_version: "-core >=2.11,<2.12"
-
-- stage: CentOS8_Ansible_Core_2_12
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: centos-8
-      ansible_version: "-core >=2.12,<2.13"
-
-- stage: CentOS8_Ansible_latest
-  dependsOn: []
-  jobs:
-  - template: templates/group_tests.yml
-    parameters:
-      build_number: $(Build.BuildNumber)
-      scenario: centos-8
-      ansible_version: ""
+# # CentOS 8
+#
+# - stage: CentOS8_Ansible_2_9
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-8
+#       ansible_version: ">=2.9,<2.10"
+#
+# - stage: CentOS8_Ansible_Core_2_11
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-8
+#       ansible_version: "-core >=2.11,<2.12"
+#
+# - stage: CentOS8_Ansible_Core_2_12
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-8
+#       ansible_version: "-core >=2.12,<2.13"
+#
+# - stage: CentOS8_Ansible_latest
+#   dependsOn: []
+#   jobs:
+#   - template: templates/group_tests.yml
+#     parameters:
+#       build_number: $(Build.BuildNumber)
+#       scenario: centos-8
+#       ansible_version: ""
 
 # CentOS 7
 
diff --git a/tests/azure/templates/build_container.yml b/tests/azure/templates/build_container.yml
index b474c9641d34b7bca18ebe10154b29261689f0a0..7d5c1fb0700089bf4b945c78601296b493ff1987 100644
--- a/tests/azure/templates/build_container.yml
+++ b/tests/azure/templates/build_container.yml
@@ -6,6 +6,9 @@ parameters:
     type: string
   - name: build_scenario_name
     type: string
+  - name: python_version
+    type: string
+    default: 3.x
 
 jobs:
 - job: BuildTestImage${{ parameters.job_name_suffix }}
@@ -13,7 +16,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.6'
+      versionSpec: '${{ parameters.python_version }}'
 
   - script: python -m pip install --upgrade pip setuptools wheel ansible
     displayName: Install tools