diff --git a/constants.py b/constants.py
index fc9c165d..bc1a400d 100644
--- a/constants.py
+++ b/constants.py
@@ -167,14 +167,15 @@
     "amd64-debian-12-debug-embedded",
     "amd64-fedora-40",
     "amd64-fedora-41",
-    "amd64-opensuse-1506",
-    "amd64-sles-1506",
     "amd64-ubuntu-2404",
     "ppc64le-ubuntu-2404",
-    "s390x-sles-1506",
     "s390x-ubuntu-2404",
     "ppc64le-debian-12",
 ]
+# For 10.11 when 1505 goes EOL
+#   "amd64-opensuse-1506",
+#   "amd64-sles-1506",
+#   "s390x-sles-1506",
 SUPPORTED_PLATFORMS["10.11"] += SUPPORTED_PLATFORMS["10.10"]
 
 SUPPORTED_PLATFORMS["11.0"] = SUPPORTED_PLATFORMS["10.11"].copy()
diff --git a/os_info.yaml b/os_info.yaml
index 48d12a83..928af7b6 100644
--- a/os_info.yaml
+++ b/os_info.yaml
@@ -76,6 +76,7 @@ opensuse-1506:
   arch:
     - amd64
   type: rpm
+  install_only: True
 rhel-8:
   version_name: 8
   arch:
@@ -108,7 +109,7 @@ sles-1505:
   version_name: 15.5
   arch:
     - amd64
-# TEMP - currently short on hardware - s390x
+    - s390x
   type: rpm
 sles-1506:
   version_name: 15.6
@@ -116,6 +117,7 @@ sles-1506:
     - amd64
     - s390x
   type: rpm
+  install_only: True
 ubuntu-2004:
   version_name: focal
   arch:
diff --git a/schedulers_definition.py b/schedulers_definition.py
index 6204121f..c835cc61 100644
--- a/schedulers_definition.py
+++ b/schedulers_definition.py
@@ -56,30 +56,32 @@ def bigtestBuilders(props: IProperties) -> list[str]:
     return []
 
 
-@util.renderer
-def installBuilders(props: IProperties) -> list[str]:
-    builder_name = props.getProperty("parentbuildername")
-    for b in BUILDERS_INSTALL:
-        if builder_name in b:
-            builders = [b]
-            if "rhel" in builder_name:
+def getBuilderNames(builderName: str, builders_list: list[str]) -> list[str]:
+    builders = []
+    for b in builders_list:
+        if builderName in b:
+            builders.append(b)
+            if "rhel" in builderName:
                 builders.append(b.replace("rhel", "almalinux"))
                 builders.append(b.replace("rhel", "rockylinux"))
-            return builders
-    return []
+            if "sles-1505" in builderName or "opensuse-1505" in builderName:
+                builders.append(b.replace("1505", "1506"))
+            break
+    return builders
+
+
+@util.renderer
+def installBuilders(props: IProperties) -> list[str]:
+    builderName = str(props.getProperty("parentbuildername"))
+
+    return getBuilderNames(builderName, builders_install)
 
 
 @util.renderer
 def upgradeBuilders(props: IProperties) -> list[str]:
-    builder_name = props.getProperty("parentbuildername")
-    builders = []
-    for b in BUILDERS_UPGRADE:
-        if builder_name in b:
-            if "rhel" in builder_name:
-                builders.append(b.replace("rhel", "almalinux"))
-                builders.append(b.replace("rhel", "rockylinux"))
-            builders.append(b)
-    return builders
+    builderName = str(props.getProperty("parentbuildername"))
+
+    return getBuilderNames(builderName, builders_upgrade)
 
 
 @util.renderer