diff --git a/molecule/centos-8-build/molecule.yml b/molecule/centos-8-build/molecule.yml
index e19fe11a826af2f6992e603b9aef2102f2f2c01c..ec3ef20def6b60cf7b3e0c4da6e5cfce400d78fa 100644
--- a/molecule/centos-8-build/molecule.yml
+++ b/molecule/centos-8-build/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: docker
 platforms:
   - name: centos-8-build
-    image: centos:8
+    image: "centos:centos8"
     pre_build_image: true
     hostname: ipaserver.test.local
     dns_servers:
diff --git a/molecule/fedora-latest-build/molecule.yml b/molecule/fedora-latest-build/molecule.yml
index 624d99f2e7a7a3351504d7a9a4752e610e7d42c5..4c6c2fcca0ec1e1a7a4e5ba59eb2c4400dec3ee2 100644
--- a/molecule/fedora-latest-build/molecule.yml
+++ b/molecule/fedora-latest-build/molecule.yml
@@ -3,7 +3,7 @@ driver:
   name: docker
 platforms:
   - name: fedora-latest-build
-    image: fedora-latest
+    image: "fedora:latest"
     dockerfile: Dockerfile
     hostname: ipaserver.test.local
     dns_servers:
diff --git a/tests/azure/azure-pipelines.yml b/tests/azure/azure-pipelines.yml
index d8914d96b1569c36d42143eb5ec834d71dd84a6e..997066bd5888246473960f112881021da454bf9a 100644
--- a/tests/azure/azure-pipelines.yml
+++ b/tests/azure/azure-pipelines.yml
@@ -15,7 +15,7 @@ trigger:
 - master
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: 'ubuntu-20.04'
 
 stages:
 - stage: Centos7
diff --git a/tests/azure/build-containers.yml b/tests/azure/build-containers.yml
index 628d20b9728b20bd920cdf1c9f9b9953e238c66a..5dc3fbfc53ebc401fee164e4f70443b482ca4af5 100644
--- a/tests/azure/build-containers.yml
+++ b/tests/azure/build-containers.yml
@@ -11,7 +11,7 @@ schedules:
 trigger: none
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: 'ubuntu-20.04'
 
 jobs:
 
diff --git a/tests/azure/templates/build_container.yml b/tests/azure/templates/build_container.yml
index 8649a336f3d776f486ec8e88615db9630e190979..0bd493213795eaa33d27e9b15263c70d09c74a67 100644
--- a/tests/azure/templates/build_container.yml
+++ b/tests/azure/templates/build_container.yml
@@ -15,7 +15,7 @@ jobs:
     inputs:
       versionSpec: '3.6'
 
-  - script: python -m pip install --upgrade pip setuptools wheel
+  - script: python -m pip install --upgrade pip setuptools wheel ansible
     displayName: Install tools
 
   - script: pip install molecule[docker]