diff --git a/src/bci_build/templates.py b/src/bci_build/templates.py
index b75077e7d..0160dcbab 100644
--- a/src/bci_build/templates.py
+++ b/src/bci_build/templates.py
@@ -52,11 +52,16 @@
 LABEL org.openbuildservice.disturl="%DISTURL%"
 {% if image.is_opensuse %}LABEL org.opensuse.lifecycle-url="{{ image.lifecycle_url }}"
 LABEL org.opensuse.release-stage="{{ image.release_stage }}"
-{% else %}LABEL com.suse.supportlevel="{{ image.support_level }}"
-{%- if image.supported_until %}
-LABEL com.suse.supportlevel.until="{{ image.supported_until }}"
-{%- endif %}
+{% endif -%}
+{% if not image.is_opensuse -%}
+{% if image.image_type == "application" -%}
+LABEL com.suse.supportlevel="{{ image.support_level }}"
 LABEL com.suse.eula="{{ image.eula }}"
+{% else -%}
+LABEL {{ image.labelprefix }}.supportlevel="{{ image.support_level }}"
+LABEL {{ image.labelprefix }}.eula="{{ image.eula }}"
+{%- endif %}
+{% if image.supported_until %}LABEL com.suse.supportlevel.until="{{ image.supported_until }}"{% endif %}
 LABEL com.suse.lifecycle-url="{{ image.lifecycle_url }}"
 LABEL com.suse.image-type="{{ image.image_type }}"
 LABEL com.suse.release-stage="{{ image.release_stage }}"{% endif %}
diff --git a/tests/test_build_recipe.py b/tests/test_build_recipe.py
index 597920219..f6a6a9a47 100644
--- a/tests/test_build_recipe.py
+++ b/tests/test_build_recipe.py
@@ -34,9 +34,10 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="registry.suse.com/bci/test:28-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="techpreview"
+LABEL com.suse.bci.test.supportlevel="techpreview"
+LABEL com.suse.bci.test.eula="sle-bci"
 LABEL com.suse.supportlevel.until="2024-02-01"
-LABEL com.suse.eula="sle-bci"
+
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="released"
@@ -138,8 +139,9 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="registry.suse.com/bci/test:%%emacs_ver%%-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="techpreview"
-LABEL com.suse.eula="sle-bci"
+LABEL com.suse.bci.test.supportlevel="techpreview"
+LABEL com.suse.bci.test.eula="sle-bci"
+
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="released"
@@ -233,8 +235,9 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="registry.suse.com/bci/test:28-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
-LABEL com.suse.supportlevel="techpreview"
-LABEL com.suse.eula="sle-bci"
+LABEL com.suse.bci.test.supportlevel="techpreview"
+LABEL com.suse.bci.test.eula="sle-bci"
+
 LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
 LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="released"
@@ -334,6 +337,7 @@
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/test:28.2-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
+
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"