diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 5d7c60d7..4bdcce5f 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -525,7 +525,7 @@ chmod 644 %buildroot/etc/rpm/macros.zz-modules
         target_length = 50 + len('-build')
         target = module_build_service.utils.generate_koji_tag(
             self.module.name, self.module.stream, self.module.version, self.module.context,
-            target_length)
+            target_length, scratch=self.module.scratch, scratch_id=self.module.id)
         # Add main build target.
         self.module_target = self._koji_add_target(target, self.module_build_tag, self.module_tag)
 
diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py
index b149cd26..6c73b90e 100644
--- a/tests/test_builder/test_koji.py
+++ b/tests/test_builder/test_koji.py
@@ -550,6 +550,31 @@ class TestKojiBuilder:
             expected_calls = []
         assert session.packageListBlock.mock_calls == expected_calls
 
+    @pytest.mark.parametrize('scratch', [False, True])
+    def test_buildroot_connect_create_target(self, scratch):
+        if scratch:
+            self.module.scratch = scratch
+
+        builder = FakeKojiModuleBuilder(
+            owner=self.module.owner, module=self.module, config=conf, tag_name='module-foo',
+            components=["nginx"])
+        session = builder.koji_session
+        session.getBuildTarget = MagicMock()
+        session.getBuildTarget.return_value = {}
+
+        groups = OrderedDict()
+        groups['build'] = set(["unzip"])
+        groups['srpm-build'] = set(["fedora-release"])
+        builder.buildroot_connect(groups)
+
+        if scratch:
+            expected_calls = [mock.call(
+                'scrmod-nginx-1-2-00000000+2', 'module-foo-build', 'module-foo')]
+        else:
+            expected_calls = [mock.call(
+                'module-nginx-1-2-00000000', 'module-foo-build', 'module-foo')]
+        assert session.createBuildTarget.mock_calls == expected_calls
+
     @patch('module_build_service.builder.KojiModuleBuilder.KojiClientSession')
     def test_get_built_rpms_in_module_build(self, ClientSession):
         session = ClientSession.return_value