diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index 1d72c5ed..07664ae6 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -55,6 +55,17 @@ stages:
               test: 'devel/sanity/extra'
             - name: Units
               test: 'devel/units/1'
+  - stage: Ansible_2_12
+    displayName: Sanity & Units 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          targets:
+            - name: Sanity
+              test: '2.12/sanity/1'
+            - name: Units
+              test: '2.12/units/1'
   - stage: Ansible_2_11
     displayName: Sanity & Units 2.11
     dependsOn: []
@@ -116,6 +127,25 @@ stages:
           groups:
             - 4
             - 5
+  - stage: Docker_2_12
+    displayName: Docker 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.12/linux/{0}
+          targets:
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 34
+              test: fedora34
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 20.04
+              test: ubuntu2004
+          groups:
+            - 4
+            - 5
   - stage: Docker_2_11
     displayName: Docker 2.11
     dependsOn: []
@@ -124,14 +154,12 @@ stages:
         parameters:
           testFormat: 2.11/linux/{0}
           targets:
-            - name: CentOS 8
-              test: centos8
+            - name: CentOS 7
+              test: centos7
             - name: Fedora 33
               test: fedora33
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
+            - name: Ubuntu 18.04
+              test: ubuntu1804
           groups:
             - 4
             - 5
@@ -143,18 +171,10 @@ stages:
         parameters:
           testFormat: 2.10/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
-            - name: CentOS 8
-              test: centos8
             - name: Fedora 32
               test: fedora32
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
+            - name: Ubuntu 16.04
+              test: ubuntu1604
           groups:
             - 4
             - 5
@@ -166,14 +186,10 @@ stages:
         parameters:
           testFormat: 2.9/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
             - name: Fedora 31
               test: fedora31
             - name: openSUSE 15 py2
               test: opensuse15py2
-            - name: Ubuntu 16.04
-              test: ubuntu1604
           groups:
             - 4
             - 5
@@ -195,6 +211,22 @@ stages:
             - 3
             - 4
             - 5
+  - stage: Remote_2_12
+    displayName: Remote 2.12
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: RHEL {0}
+          testFormat: 2.12/rhel/{0}
+          targets:
+            - test: '8.4'
+          groups:
+            - 1
+            - 2
+            - 3
+            - 4
+            - 5
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
@@ -248,16 +280,19 @@ stages:
     condition: succeededOrFailed()
     dependsOn:
       - Ansible_devel
+      - Ansible_2_12
       - Ansible_2_11
       - Ansible_2_10
       - Ansible_2_9
       - Remote_devel
-      - Docker_devel
+      - Remote_2_12
       - Remote_2_11
-      - Docker_2_11
       - Remote_2_10
-      - Docker_2_10
       - Remote_2_9
+      - Docker_devel
+      - Docker_2_12
+      - Docker_2_11
+      - Docker_2_10
       - Docker_2_9
     jobs:
       - template: templates/coverage.yml
diff --git a/README.md b/README.md
index f8b04dc4..8b9ccfd7 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Please note that this collection does **not** support Windows targets. The conne
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
+Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11 and ansible-core 2.12 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
 
 ## External requirements