diff --git a/bci_tester/data.py b/bci_tester/data.py
index 54deca3b..e69d292d 100755
--- a/bci_tester/data.py
+++ b/bci_tester/data.py
@@ -43,7 +43,6 @@
 
 # Allowed os versions for Language and Application containers
 ALLOWED_NONBASE_OS_VERSIONS = (
-    "15.5",
     "15.6",
     "15.6-ai",
     "15.7",
@@ -53,7 +52,6 @@
 
 # Allowed os versions for SLE_BCI repo checks
 ALLOWED_BCI_REPO_OS_VERSIONS = (
-    "15.5",
     "15.6",
     "15.6-ai",
     "15.7",
@@ -67,7 +65,7 @@
 _DEFAULT_NONBASE_OS_VERSIONS = ("15.6", "15.7", "tumbleweed")
 
 # Test base containers by default for these versions
-_DEFAULT_BASE_OS_VERSIONS = ("15.5", "15.6", "15.7", "16.0", "tumbleweed")
+_DEFAULT_BASE_OS_VERSIONS = ("15.6", "15.7", "16.0", "tumbleweed")
 
 # List the released versions of SLE, used for supportabilty and EULA tests
 RELEASED_SLE_VERSIONS = ("15.3", "15.4", "15.5", "15.6", "15.6-ai")
@@ -523,19 +521,19 @@ def create_BCI(
 )
 
 OPENJDK_11_CONTAINER = create_BCI(
-    build_tag="bci/openjdk:11", available_versions=["15.5", "tumbleweed"]
+    build_tag="bci/openjdk:11", available_versions=["tumbleweed"]
 )
 OPENJDK_DEVEL_11_CONTAINER = create_BCI(
     build_tag="bci/openjdk-devel:11",
-    available_versions=["15.5", "tumbleweed"],
+    available_versions=["tumbleweed"],
     custom_entry_point="/bin/sh",
 )
 OPENJDK_17_CONTAINER = create_BCI(
-    build_tag="bci/openjdk:17", available_versions=["15.5", "tumbleweed"]
+    build_tag="bci/openjdk:17", available_versions=["tumbleweed"]
 )
 OPENJDK_DEVEL_17_CONTAINER = create_BCI(
     build_tag="bci/openjdk-devel:17",
-    available_versions=["15.5", "tumbleweed"],
+    available_versions=["tumbleweed"],
     custom_entry_point="/bin/sh",
 )
 OPENJDK_21_CONTAINER = create_BCI(
@@ -565,9 +563,6 @@ def create_BCI(
     OPENJDK_DEVEL_23_CONTAINER,
 ]
 
-NODEJS_18_CONTAINER = create_BCI(
-    build_tag="bci/nodejs:18", available_versions=["15.5"]
-)
 NODEJS_20_CONTAINER = create_BCI(
     build_tag="bci/nodejs:20",
     available_versions=["15.6"],
@@ -579,7 +574,6 @@ def create_BCI(
 )
 
 NODEJS_CONTAINERS = [
-    NODEJS_18_CONTAINER,
     NODEJS_20_CONTAINER,
     NODEJS_22_CONTAINER,
 ]
@@ -784,7 +778,7 @@ def create_BCI(
     )
     for pg_ver, pg_versions in (
         (14, ["tumbleweed"]),
-        (15, ["15.5", "tumbleweed"]),
+        (15, ["tumbleweed"]),
         (16, _DEFAULT_NONBASE_OS_VERSIONS),
         (17, ["15.6", "tumbleweed"]),
     )
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index ac8de520..dedc8458 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -59,15 +59,11 @@
 from bci_tester.data import MILVUS_CONTAINER
 from bci_tester.data import MINIMAL_CONTAINER
 from bci_tester.data import NGINX_CONTAINER
-from bci_tester.data import NODEJS_18_CONTAINER
-from bci_tester.data import NODEJS_20_CONTAINER
-from bci_tester.data import NODEJS_22_CONTAINER
+from bci_tester.data import NODEJS_CONTAINERS
 from bci_tester.data import OLLAMA_CONTAINER
-from bci_tester.data import OPENJDK_11_CONTAINER
 from bci_tester.data import OPENJDK_17_CONTAINER
 from bci_tester.data import OPENJDK_21_CONTAINER
 from bci_tester.data import OPENJDK_23_CONTAINER
-from bci_tester.data import OPENJDK_DEVEL_11_CONTAINER
 from bci_tester.data import OPENJDK_DEVEL_17_CONTAINER
 from bci_tester.data import OPENJDK_DEVEL_21_CONTAINER
 from bci_tester.data import OPENJDK_DEVEL_23_CONTAINER
@@ -157,9 +153,6 @@ def _get_container_label_prefix(
             "openjdk.devel",
             ImageType.LANGUAGE_STACK,
         ),
-        (NODEJS_18_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
-        (NODEJS_20_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
-        (NODEJS_22_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (RUBY_25_CONTAINER, "ruby", ImageType.LANGUAGE_STACK),
         (RUBY_33_CONTAINER, "ruby", ImageType.LANGUAGE_STACK),
         (INIT_CONTAINER, "init", ImageType.OS),
@@ -168,6 +161,7 @@ def _get_container_label_prefix(
         (PHP_8_FPM, "php-fpm", ImageType.LANGUAGE_STACK),
         (NGINX_CONTAINER, "nginx", ImageType.APPLICATION),
     ]
+    + [(c, "nodejs", ImageType.LANGUAGE_STACK) for c in NODEJS_CONTAINERS]
     + [(c, "python", ImageType.LANGUAGE_STACK) for c in PYTHON_CONTAINERS]
     + [
         (c, "python", ImageType.SAC_LANGUAGE_STACK)