diff --git a/_service b/_service
index f5ca758..c910f60 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,4 @@
 <services>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
   <service mode="buildtime" name="kiwi_label_helper"/>
-
 </services>
\ No newline at end of file
diff --git a/minimal-image.kiwi b/minimal-image.kiwi
index c25566f..7ebc5bd 100644
--- a/minimal-image.kiwi
+++ b/minimal-image.kiwi
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- SPDX-License-Identifier: MIT -->
 
-<!-- OBS-AddTag: bci/bci-minimal:%OS_VERSION_ID_SP% bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% bci/bci-minimal:latest -->
+<!-- OBS-AddTag: opensuse/bci/bci-minimal:%OS_VERSION_ID_SP% opensuse/bci/bci-minimal:%OS_VERSION_ID_SP%.%RELEASE% opensuse/bci/bci-minimal:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="6.5" name="minimal-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>https://www.suse.com/</contact>
-    <specification>openSUSE Tumbleweed BCI %OS_VERSION% Minimal Container Image</specification>
+    <specification>openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image</specification>
   </description>
   <preferences>
-    <type image="docker" derived_from="obsrepositories:/bci/bci-micro#latest">
+    <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
-          name="bci/bci-minimal"
+          name="opensuse/bci/bci-minimal"
           tag="%OS_VERSION_ID_SP%"
           maintainer="openSUSE (https://www.opensuse.org/)"
           additionaltags="%OS_VERSION_ID_SP%.%RELEASE%,latest">
         <labels>
           <!-- See https://en.opensuse.org/Building_derived_containers#Labels -->
           <suse_label_helper:add_prefix prefix="org.opensuse.bci.minimal">
-            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION% Minimal Container Image"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI %OS_VERSION_NO_DASH% Minimal Container Image"/>
             <label name="org.opencontainers.image.description" value="A minimal environment for containers based on the SLE Base Container Image."/>
             <label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%.%RELEASE%"/>
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
@@ -30,12 +30,8 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
 
             <label name="com.suse.release-stage" value="released"/>
-
           </suse_label_helper:add_prefix>
         </labels>
-
-
-
       </containerconfig>
     </type>
     <version>15.Tumbleweed.0</version>