diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index d7982812..0241b8f8 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -38,7 +38,7 @@ jobs:
           - tmt_plan: "rhel8-docker"
             os_test: "rhel8"
             context: "RHEL8"
-            compose: "RHEL-8.3.1-Released"
+            compose: "RHEL-8.6.0-Nightly"
             api_key: "TF_INTERNAL_API_KEY"
             branch: "master"
             tmt_repo: "https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans"
diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
index 29aed6c6..ce59abc3 100644
--- a/.github/workflows/openshift-tests.yml
+++ b/.github/workflows/openshift-tests.yml
@@ -44,7 +44,7 @@ jobs:
           - tmt_plan: "rhel8-openshift-4"
             os_test: "rhel8"
             context: "RHEL8 - OpenShift 4"
-            compose: "RHEL-8.3.1-Released"
+            compose: "RHEL-8.6.0-Nightly"
             tmt_url: "http://artifacts.osci.redhat.com/testing-farm/"
             test_name: "test-openshift-4"
             api_key: "TF_INTERNAL_API_KEY"
diff --git a/common b/common
index ef528b36..58b21d3e 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ef528b3689dc75bbfdd5b57251699c4101ef17c6
+Subproject commit 58b21d3ea5b6ffcbd976cfb7519c061b8df3c761