diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
index c8b6c53..156dd31 100644
--- a/.github/workflows/container-tests.yml
+++ b/.github/workflows/container-tests.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         container-to-test: ["postgresql-container", "nginx-container", "s2i-perl-container", "s2i-python-container", "s2i-base-container" ]
-        os: ["fedora", "c9s", "rhel8", "rhel9", "c10s", "rhel10", "c11s", "rhel11"]
+        os: ["fedora", "c9s", "rhel8", "rhel9", "c10s", "rhel10"]
 
     if: |
       github.event.issue.pull_request
@@ -32,7 +32,7 @@ jobs:
           branch="master"
           tf_scope="private"
           tmt_repo="https://gitlab.cee.redhat.com/platform-eng-core-services/sclorg-tmt-plans"
-          if [ "${{ matrix.os }}" == "fedora" ] || [ "${{ matrix.os }}" == "c9s" ] || [ "${{ matrix.os }}" == "c10s" ] || [ "${{ matrix.os }}" == "c11s" ]; then
+          if [ "${{ matrix.os }}" == "fedora" ] || [ "${{ matrix.os }}" == "c9s" ] || [ "${{ matrix.os }}" == "c10s" ]; then
             api_key=${{ secrets.TF_PUBLIC_API_KEY }}
             branch="main"
             tf_scope="public"
@@ -49,12 +49,6 @@ jobs:
                 compose="CentOS-Stream-10"
                 context="CentOS Stream 10"
                 tmt_plan="/c10s"
-            else
-              # TODO - update compose and context for c11s when it will be available in Testing Farm
-              compose="CentOS-Stream-10"
-              context="CentOS Stream 11"
-              tmt_plan="/c11s"
-            fi
           else
             if [ "${{ matrix.os }}" == "rhel8" ]; then
               compose="RHEL-8.10.0-Nightly"
@@ -68,12 +62,6 @@ jobs:
               compose="RHEL-10-Nightly"
               context="RHEL10"
               tmt_plan="/rhel10-docker$"
-            else
-              # TODO - update compose and context for rhel11 when it will be available in Testing Farm
-              compose="RHEL-10-Nightly"
-              context="RHEL11"
-              tmt_plan="/rhel11-docker$"
-            fi
           fi
           echo "api_key=$api_key" >> "$GITHUB_OUTPUT"
           echo "branch=$branch" >> "$GITHUB_OUTPUT"
diff --git a/generator.py b/generator.py
index f9939a5..c7320ac 100755
--- a/generator.py
+++ b/generator.py
@@ -81,6 +81,7 @@ def filename_to_distro_config(
     """
     rhel_match = re.match(r".*\.rhel(\d+)$", filename)
     centos_stream_match = re.match(r".*\.c(\d+)s$", filename)
+    fedora_match = re.match(r".*\.f(\d+)$", filename)
 
     if rhel_match:
         config = f"rhel-{rhel_match.group(1)}-x86_64.yaml"
@@ -96,6 +97,8 @@ def filename_to_distro_config(
             config = sorted_configs[0]
         else:
             config = ""
+    elif fedora_match: # just for base and core images
+        config = f"fedora-{fedora_match.group(1)}-x86_64.yaml"
     else:
         raise RuntimeError(
             f"File {filename} does not match any of the known suffixes: .rhelXX, .cXs, or .fedora"