diff --git a/Dockerfile b/Dockerfile
index 998b84d..fddcd6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
 # SPDX-License-Identifier: MIT
-#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%
-#!BuildTag: bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%
-#!BuildTag: bci/bci-init:latest
+#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%
+#!BuildTag: opensuse/bci/bci-init:%OS_VERSION_ID_SP%.%RELEASE%
+#!BuildTag: opensuse/bci/bci-init:latest
+
 FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.init
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI %OS_VERSION% Init Container Image"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Init Container Image"
 LABEL org.opencontainers.image.description="Systemd environment for containers based on the SLE Base Container Image. This container is not supported when using container runtime other than podman."
 LABEL org.opencontainers.image.version="%OS_VERSION_ID_SP%.%RELEASE%"
 LABEL org.opencontainers.image.url="https://www.opensuse.org"
@@ -22,8 +23,6 @@ LABEL com.suse.release-stage="released"
 LABEL usage="This container should only be used to build containers for daemons. Add your packages and enable services using systemctl."
 
 RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip; zypper -n clean; rm -rf /var/log/*
-
-
-
 CMD ["/usr/lib/systemd/systemd"]
+RUN systemctl disable getty@tty1.service
 HEALTHCHECK --interval=5s --timeout=5s --retries=5     CMD ["/usr/bin/systemctl", "is-active", "multi-user.target"]
diff --git a/_service b/_service
index 52b4539..bec8a47 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,4 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="docker_label_helper"/>
-
 </services>
\ No newline at end of file