diff --git a/src/mrack/transformers/beaker.py b/src/mrack/transformers/beaker.py
index 4d31c6dd..aa1f93d1 100644
--- a/src/mrack/transformers/beaker.py
+++ b/src/mrack/transformers/beaker.py
@@ -204,11 +204,14 @@ def create_host_requirement(self, host):
             "name": host["name"],
             "distro": distro,
             "os": host["os"],
-            "job_group": host["group"],
+            "group": host["group"],
             "meta_distro": "distro" in host,
             "arch": host.get("arch", "x86_64"),
             "variant": variant,
             "job_owner": host.get(CONFIG_KEY, {}).get("beaker_job_owner"),
+            "job_group": host.get(CONFIG_KEY, {}).get(
+                "beaker_job_group"
+            ),  # Beaker group of users
             "ks_meta": self._get_ks_meta(host),
             "kernel_options": self._get_kernel_options(host),
             "kernel_options_post": self._get_kernel_options_post(host),
diff --git a/tests/unit/test_beaker_transformer.py b/tests/unit/test_beaker_transformer.py
index 72c9132e..321bf90b 100644
--- a/tests/unit/test_beaker_transformer.py
+++ b/tests/unit/test_beaker_transformer.py
@@ -60,7 +60,8 @@ class TestBeakerTransformer:
             "ks_meta": "FEDORA_HOST_KS_META",
             "kernel_options": "FEDORA_KERNEL_OPTIONS",
             "kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST",
-            "job_owner": "FEDORA",
+            "beaker_job_owner": "FEDORA",
+            "beaker_job_group": "linux-engineering",
             "ks_append": {
                 "pre-install": "%pre\npre_dummy\n%end",
                 "script": "script_dummy",
@@ -197,7 +198,7 @@ async def create_transformer(self, legacy=False):
                     "variant": "Server",
                     "ks_meta": "FEDORA_HOST_KS_META",
                     "job_owner": "FEDORA",
-                    "job_group": "client",
+                    "job_group": "linux-engineering",
                     "ks_append": maximal_ksappend,
                     "kernel_options": "FEDORA_KERNEL_OPTIONS",
                     "kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST",
@@ -217,7 +218,6 @@ async def create_transformer(self, legacy=False):
                     "distro": "Fedora-36%",
                     "variant": "Server",
                     "ks_meta": "FEDORA_HOST_KS_META",
-                    "job_group": "server",
                     "ks_append": default_ks_append,
                     "whiteboard": default_whiteboard,
                     "priority": default_prio,
@@ -232,7 +232,6 @@ async def create_transformer(self, legacy=False):
                 {
                     "distro": "CentOS-Stream-9%",
                     "variant": "BaseOS",
-                    "job_group": "ipaserver",
                     "ks_meta": "PROV_CONF_CENTOS_KS_META",
                     "ks_append": ["%post\ncat /etc/redhat-release\n%end"],
                     "whiteboard": default_whiteboard,
@@ -248,7 +247,6 @@ async def create_transformer(self, legacy=False):
                 {
                     "distro": "CentOS-Stream-9%",
                     "variant": "BaseOS",
-                    "job_group": "ipaclient",
                     "ks_meta": "PROV_CONF_CENTOS_KS_META",
                     "ks_append": ["%post\ncat /etc/redhat-release\n%end"],
                     "whiteboard": default_whiteboard,
@@ -266,7 +264,6 @@ async def create_transformer(self, legacy=False):
                 {
                     "distro": "win-2022",
                     "variant": "BaseOS",
-                    "job_group": "ad_root",
                     "ks_meta": "PROV_CONF_DEFAULT",
                     "ks_append": default_ks_append,
                     "whiteboard": "BEAKER DOES NOT SUPPORT WINDOWS THIS JOB MUST FAIL",
@@ -282,7 +279,6 @@ async def create_transformer(self, legacy=False):
                 {
                     "distro": "RHEL-8.6%",
                     "variant": "BaseOS",
-                    "job_group": "ipaserver",
                     "ks_meta": "PROV_CONF_RHEL86_KS_META",
                     "ks_append": [
                         "%post\ncat /etc/redhat-release\nwget redhat.com\n%end"