diff --git a/.github/workflows/build-opensuse.pip-based.yml b/.github/workflows/build-opensuse.pip-based.yml
index 87064da4..3627dbc8 100644
--- a/.github/workflows/build-opensuse.pip-based.yml
+++ b/.github/workflows/build-opensuse.pip-based.yml
@@ -29,7 +29,7 @@ jobs:
         include:
           - image: opensuse/leap:15.5
             platforms: linux/amd64
-            tag: opensuse15.5
+            tag: opensuse1505
             nogalera: true
 
           - image: opensuse/leap:15.6
diff --git a/.github/workflows/build-sles.pip-based.yml b/.github/workflows/build-sles.pip-based.yml
index c6305d49..f470d5cb 100644
--- a/.github/workflows/build-sles.pip-based.yml
+++ b/.github/workflows/build-sles.pip-based.yml
@@ -30,7 +30,7 @@ jobs:
         include:
           - image: registry.suse.com/bci/bci-base:15.5
             platforms: linux/amd64, linux/s390x
-            tag: sles15.5
+            tag: sles1505
             nogalera: true
 
           - image: registry.suse.com/bci/bci-base:15.6
diff --git a/constants.py b/constants.py
index a536a2fb..8c9c2b17 100644
--- a/constants.py
+++ b/constants.py
@@ -149,9 +149,12 @@
 
 supportedPlatforms["10.6"] += [
     "aarch64-ubuntu-2204",
+    "amd64-opensuse-1505",
+    "amd64-sles-1505",
     "amd64-ubuntu-2204",
     "ppc64le-ubuntu-2204",
     "s390x-ubuntu-2204",
+    "s390x-sles-1505",
     "x86-debian-12",
 ]
 
diff --git a/master.cfg b/master.cfg
index 0c43c2d6..85d6f245 100644
--- a/master.cfg
+++ b/master.cfg
@@ -391,9 +391,9 @@ for builder in master_config["builders"]:
         "amd64-debian-sid",
         "aarch64-debian-sid",
         "ppc64le-debian-sid",
-        "amd64-opensuse-15.5",
-        "amd64-sles-15.5",
-        "s390x-sles-15.5",
+        "amd64-opensuse-1505",
+        "amd64-sles-1505",
+        "s390x-sles-1505",
     ]:
         tags += ["release_packages"]
     c["builders"].append(
diff --git a/os_info.yaml b/os_info.yaml
index ed60b32b..b3986027 100644
--- a/os_info.yaml
+++ b/os_info.yaml
@@ -72,6 +72,11 @@ fedora-40:
     - amd64
     - aarch64
   type: rpm
+opensuse-1505:
+  version_name: 15.5
+  arch:
+    - amd64
+  type: rpm
 opensuse-15:
   version_name: 15
   arch:
@@ -115,6 +120,12 @@ sles-12:
   arch:
     - s390x
   type: rpm
+sles-1505:
+  version_name: 15.5
+  arch:
+    - amd64
+    - s390x
+  type: rpm
 sles-15:
   version_name: 15
   arch: