diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index 21c89f209..b3dcda4b0 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -115,6 +115,23 @@
     },
     "overrides": {}
   },
+  "edge-commit-with-container": {
+    "compose-request": {
+      "distro": "",
+      "arch": "",
+      "image-type": "edge-commit",
+      "repositories": [],
+      "filename": "commit.tar",
+      "blueprint": {
+        "containers": [
+          {
+            "source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal"
+          }
+        ]
+      }
+    },
+    "overrides": {}
+  },
   "edge-container": {
     "compose-request": {
       "distro": "",
@@ -731,6 +748,92 @@
       }
     },
     "overrides": {
+      "rhel-91": {
+        "blueprint": {
+          "name": "qcow2-customize-boot-test",
+          "description": "Image for boot test",
+          "packages": [
+            {
+              "name": "bash",
+              "version": "*"
+            }
+          ],
+          "modules": [],
+          "groups": [
+            {
+              "name": "core"
+            }
+          ],
+          "customizations": {
+            "hostname": "my-host",
+            "kernel": {
+              "append": "debug"
+            },
+            "sshkey": [
+              {
+                "user": "user1",
+                "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost"
+              }
+            ],
+            "user": [
+              {
+                "name": "user2",
+                "description": "description 2",
+                "password": "$6$BhyxFBgrEFh0VrPJ$MllG8auiU26x2pmzL4.1maHzPHrA.4gTdCvlATFp8HJU9UPee4zCS9BVl2HOzKaUYD/zEm8r/OF05F2icWB0K/",
+                "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC61wMCjOSHwbVb4VfVyl5sn497qW4PsdQ7Ty7aD6wDNZ/QjjULkDV/yW5WjDlDQ7UqFH0Sr7vywjqDizUAqK7zM5FsUKsUXWHWwg/ehKg8j9xKcMv11AkFoUoujtfAujnKODkk58XSA9whPr7qcw3vPrmog680pnMSzf9LC7J6kXfs6lkoKfBh9VnlxusCrw2yg0qI1fHAZBLPx7mW6+me71QZsS6sVz8v8KXyrXsKTdnF50FjzHcK9HXDBtSJS5wA3fkcRYymJe0o6WMWNdgSRVpoSiWaHHmFgdMUJaYoCfhXzyl7LtNb3Q+Sveg+tJK7JaRXBLMUllOlJ6ll5Hod root@localhost",
+                "home": "/home/home2",
+                "shell": "/bin/sh",
+                "groups": [
+                  "group1"
+                ],
+                "uid": 1020,
+                "gid": 1050
+              }
+            ],
+            "group": [
+              {
+                "name": "group1",
+                "gid": 1030
+              },
+              {
+                "name": "group2",
+                "gid": 1050
+              }
+            ],
+            "timezone": {
+              "timezone": "Europe/London",
+              "ntpservers": [
+                "time.example.com"
+              ]
+            },
+            "locale": {
+              "languages": [
+                "el_CY.UTF-8"
+              ],
+              "keyboard": "dvorak"
+            },
+            "services": {
+              "enabled": [
+                "sshd.socket"
+              ],
+              "disabled": [
+                "bluetooth.service"
+              ]
+            },
+            "filesystem": [
+              {
+                "mountpoint": "/opt",
+                "minsize": 1073741824
+              }
+            ]
+          },
+          "containers": [
+            {
+              "source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal"
+            }
+          ]
+        }
+      },
       "fedora-35": {
         "blueprint": {
           "name": "qcow2-customize-boot-test",