diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e1b50ccc6..dd48aba01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -375,7 +375,7 @@ jobs:
       distro-slug: fedora-37
       display-name: Fedora 37
       timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["latest"]'
 
 
   fedora-38:
@@ -389,7 +389,7 @@ jobs:
       distro-slug: fedora-38
       display-name: Fedora 38
       timeout: 20
-      instances: '["git-master", "latest"]'
+      instances: '["latest"]'
 
 
   gentoo:
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
index 6d34d0084..4f25e3203 100755
--- a/.github/workflows/templates/generate.py
+++ b/.github/workflows/templates/generate.py
@@ -212,6 +212,19 @@
     "nightly",
 ]
 
+# TODO: Revert the commit relating to this section, once the Git-based builds
+#       have been fixed for the distros listed below
+#
+#       Apparent failure is:
+#
+#           /usr/lib/python3.11/site-packages/setuptools/command/install.py:34:
+#           SetuptoolsDeprecationWarning: setup.py install is deprecated.
+#           Use build and pip and other standards-based tools.
+GIT_DISTRO_BLACKLIST = [
+    "fedora-37",
+    "fedora-38",
+]
+
 LATEST_PKG_BLACKLIST = []
 
 DISTRO_DISPLAY_NAMES = {
@@ -472,6 +485,8 @@ def generate_test_jobs():
                 if bootstrap_type == "git":
                     if salt_version in GIT_VERSION_BLACKLIST:
                         continue
+                    if distro in GIT_DISTRO_BLACKLIST:
+                        continue
 
                 BLACKLIST = {
                     "3003": BLACKLIST_3003,