diff --git a/molecule/cloud-aws-adoptopenjdk-11/molecule.yml b/molecule/cloud-aws-adoptopenjdk-11/molecule.yml
index a121a71e..b1cf9af6 100644
--- a/molecule/cloud-aws-adoptopenjdk-11/molecule.yml
+++ b/molecule/cloud-aws-adoptopenjdk-11/molecule.yml
@@ -66,24 +66,24 @@ platforms:
       - jdk
       - repositories
 
-#  - name: test-aws-centos8-adoptopenjdk-openj9-jre-repositories-11
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - adoptopenjdk
-#      - openj9
-#      - jre
-#      - repositories
+  - name: test-aws-centos8-adoptopenjdk-openj9-jre-repositories-11
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - adoptopenjdk
+      - openj9
+      - jre
+      - repositories
 
   - name: test-aws-centos7-adoptopenjdk-local-11
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-adoptopenjdk-12/molecule.yml b/molecule/cloud-aws-adoptopenjdk-12/molecule.yml
index a80757ad..30e5a8f4 100644
--- a/molecule/cloud-aws-adoptopenjdk-12/molecule.yml
+++ b/molecule/cloud-aws-adoptopenjdk-12/molecule.yml
@@ -9,25 +9,25 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-#  - name: test-aws-centos8-adoptopenjdk-hotspot-jre-repositories-12
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - adoptopenjdk
-#      - hotspot
-#      - jre
-#      - repositories
-#      - pip3
+  - name: test-aws-centos8-adoptopenjdk-hotspot-jre-repositories-12
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - adoptopenjdk
+      - hotspot
+      - jre
+      - repositories
+      - pip3
 
   - name: test-aws-centos7-adoptopenjdk-openj9-jdk-tarball-12
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-coretto-11/molecule.yml b/molecule/cloud-aws-coretto-11/molecule.yml
index 4c4d07ba..5ba2e5f6 100644
--- a/molecule/cloud-aws-coretto-11/molecule.yml
+++ b/molecule/cloud-aws-coretto-11/molecule.yml
@@ -97,23 +97,23 @@ platforms:
       - corretto
       - web
 
-#  - name: test-aws-centos8-corretto-jdk-web-11
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.004
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - corretto
-#      - web
-#      - centos8
+  - name: test-aws-centos8-corretto-jdk-web-11
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.004
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - corretto
+      - web
+      - centos8
 
   - name: test-aws-Debian9-corretto-jdk-web-11
     image: ami-003f19e0e687de1cd
diff --git a/molecule/cloud-aws-corretto-8/molecule.yml b/molecule/cloud-aws-corretto-8/molecule.yml
index 7da82983..d85902c7 100644
--- a/molecule/cloud-aws-corretto-8/molecule.yml
+++ b/molecule/cloud-aws-corretto-8/molecule.yml
@@ -27,24 +27,24 @@ platforms:
       - fallback
       - tarball
 
-#  - name: test-aws-centos8-corretto-jdk-fallback-8
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - corretto
-#      - fallback
-#      - centos8
-#      - package
+  - name: test-aws-centos8-corretto-jdk-fallback-8
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - corretto
+      - fallback
+      - centos8
+      - package
 
   - name: test-aws-Debian9-corretto-jdk-fallback-8
     image: ami-003f19e0e687de1cd
@@ -99,23 +99,23 @@ platforms:
       - corretto
       - web
 
-#  - name: test-aws-centos8-corretto-jdk-web-8
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.004
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - corretto
-#      - web
-#      - centos8
+  - name: test-aws-centos8-corretto-jdk-web-8
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.004
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - corretto
+      - web
+      - centos8
 
   - name: test-aws-Debian9-corretto-jdk-web-8
     image: ami-003f19e0e687de1cd
diff --git a/molecule/cloud-aws-direct-8/molecule.yml b/molecule/cloud-aws-direct-8/molecule.yml
index 441c3b62..1bb9f118 100644
--- a/molecule/cloud-aws-direct-8/molecule.yml
+++ b/molecule/cloud-aws-direct-8/molecule.yml
@@ -10,24 +10,24 @@ lint: |
   ansible-lint
 platforms:
 
-#  - name: test-aws-centos8-oracle_java-8-s3-rpm
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    profile_name: epmldi-instance-profile
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - s3
-#      - package
-#      - pip3
+  - name: test-aws-centos8-oracle_java-8-s3-rpm
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    profile_name: epmldi-instance-profile
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - s3
+      - package
+      - pip3
 
   - name: test-aws-centos7-oracle_java-8-s3
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-dragonwell8/molecule.yml b/molecule/cloud-aws-dragonwell8/molecule.yml
index 530c3557..a4fe24e9 100644
--- a/molecule/cloud-aws-dragonwell8/molecule.yml
+++ b/molecule/cloud-aws-dragonwell8/molecule.yml
@@ -9,22 +9,22 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-#  - name: test-aws-centos8-dragonwell8
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-314c223d
-#    assign_public_ip: true
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - dragonwell8
-#      - centos8
+  - name: test-aws-centos8-dragonwell8
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-314c223d
+    assign_public_ip: true
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - dragonwell8
+      - centos8
 
   - name: test-aws-centos7-dragonwell8
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-openjdk-8/molecule.yml b/molecule/cloud-aws-openjdk-8/molecule.yml
index fc9b2ba8..516ea118 100644
--- a/molecule/cloud-aws-openjdk-8/molecule.yml
+++ b/molecule/cloud-aws-openjdk-8/molecule.yml
@@ -9,22 +9,22 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-#  - name: test-aws-centos8-openjdk-8-repo
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.micro
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - repositories
-#      - centos8
+  - name: test-aws-centos8-openjdk-8-repo
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.micro
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - repositories
+      - centos8
 
   - name: test-aws-centos7-openjdk-8-repo
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-openjdk-ga/molecule.yml b/molecule/cloud-aws-openjdk-ga/molecule.yml
index ca61cb92..79dd5054 100644
--- a/molecule/cloud-aws-openjdk-ga/molecule.yml
+++ b/molecule/cloud-aws-openjdk-ga/molecule.yml
@@ -9,21 +9,21 @@ lint: |
   yamllint
   ansible-lint
 platforms:
-#  - name: test-aws-centos8-openjdk-ga
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - centos8
+  - name: test-aws-centos8-openjdk-ga
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - centos8
 
   - name: test-aws-centos7-openjdk-ga
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-sapjvm-8/molecule.yml b/molecule/cloud-aws-sapjvm-8/molecule.yml
index 9704b388..59c832ca 100644
--- a/molecule/cloud-aws-sapjvm-8/molecule.yml
+++ b/molecule/cloud-aws-sapjvm-8/molecule.yml
@@ -10,22 +10,22 @@ lint: |
   ansible-lint
 platforms:
 
-#  - name: test-aws-centos8-sapjvm-8
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-0f2b9cd66faea38af
-#    assign_public_ip: false
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - sapjvm
-#      - centos8
+  - name: test-aws-centos8-sapjvm-8
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-0f2b9cd66faea38af
+    assign_public_ip: false
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - sapjvm
+      - centos8
 
   - name: test-aws-centos7-sapjvm-8
     image: ami-9887c6e7
diff --git a/molecule/cloud-aws-sapmachine-11/molecule.yml b/molecule/cloud-aws-sapmachine-11/molecule.yml
index 5e50e404..a26a193f 100644
--- a/molecule/cloud-aws-sapmachine-11/molecule.yml
+++ b/molecule/cloud-aws-sapmachine-11/molecule.yml
@@ -29,25 +29,25 @@ platforms:
       - sapmachine_fallback
       - pip2
 
-#  - name: test-aws-centos8-sapmachine-jre-tarball-11
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-314c223d
-#    assign_public_ip: true
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - sapmachine
-#      - jre
-#      - sapmachine_fallback
-#      - pip3
-#      - centos8
+  - name: test-aws-centos8-sapmachine-jre-tarball-11
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-314c223d
+    assign_public_ip: true
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - sapmachine
+      - jre
+      - sapmachine_fallback
+      - pip3
+      - centos8
 
   - name: test-aws-Debian9-sapmachine-jre-tarball-11
     image: ami-003f19e0e687de1cd
diff --git a/molecule/cloud-aws-sapmachine-12/molecule.yml b/molecule/cloud-aws-sapmachine-12/molecule.yml
index 01368abf..a96d6d56 100644
--- a/molecule/cloud-aws-sapmachine-12/molecule.yml
+++ b/molecule/cloud-aws-sapmachine-12/molecule.yml
@@ -85,23 +85,23 @@ platforms:
       - sapmachine_fallback
       - pip3
 
-#  - name: test-aws-centos8-sapmachine-local-12
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-314c223d
-#    assign_public_ip: true
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - sapmachine
-#      - local
-#      - pip3
+  - name: test-aws-centos8-sapmachine-local-12
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-314c223d
+    assign_public_ip: true
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - sapmachine
+      - local
+      - pip3
 
 provisioner:
   name: ansible
diff --git a/molecule/cloud-aws-sapmachine-13/molecule.yml b/molecule/cloud-aws-sapmachine-13/molecule.yml
index 2e7c764e..9bfcbd50 100644
--- a/molecule/cloud-aws-sapmachine-13/molecule.yml
+++ b/molecule/cloud-aws-sapmachine-13/molecule.yml
@@ -28,24 +28,24 @@ platforms:
       - sapmachine_fallback
       - pip2
 
-#  - name: test-aws-centos8-sapmachine-jre-tarball-13
-#    image: ami-0ed2ad9dc845b42b6
-#    platform: centos8
-#    instance_type: t3.medium
-#    region: us-east-1
-#    vpc_subnet_id: subnet-314c223d
-#    assign_public_ip: true
-#    spot_price: 0.04
-#    security_group_name:
-#      - default
-#    wait_timeout: 1800
-#    ssh_user: centos
-#    groups:
-#      - rhel_family
-#      - sapmachine
-#      - jre
-#      - sapmachine_fallback
-#      - pip3
+  - name: test-aws-centos8-sapmachine-jre-tarball-13
+    image: ami-0ed2ad9dc845b42b6
+    platform: centos8
+    instance_type: t3.medium
+    region: us-east-1
+    vpc_subnet_id: subnet-314c223d
+    assign_public_ip: true
+    spot_price: 0.04
+    security_group_name:
+      - default
+    wait_timeout: 1800
+    ssh_user: centos
+    groups:
+      - rhel_family
+      - sapmachine
+      - jre
+      - sapmachine_fallback
+      - pip3
 
   - name: test-aws-Debian9-sapmachine-jre-tarball-13
     image: ami-003f19e0e687de1cd