diff --git a/config.sh b/config.sh
index b579592..8616022 100644
--- a/config.sh
+++ b/config.sh
@@ -26,6 +26,5 @@ echo "Configure image: [$kiwi_iname]..."
 /bin/rm /usr/bin/busybox
 /bin/rm /usr/bin/busybox.install
 /bin/rm -rf /usr/share/busybox
-/bin/sed -i -e 's|root::|root:!:|g' /etc/shadow
 
 exit 0
diff --git a/tumbleweed-busybox-image.changes b/tumbleweed-busybox-image.changes
index 4eec29a..59aaa9b 100644
--- a/tumbleweed-busybox-image.changes
+++ b/tumbleweed-busybox-image.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed May 29 15:43:02 CEST 2019 - kukuk@suse.de
+
+- Fix labels
+
+-------------------------------------------------------------------
+Wed May 29 15:11:28 CEST 2019 - kukuk@suse.de
+
+- Move to official opensuse repository
+
 -------------------------------------------------------------------
 Thu May  9 20:07:19 CEST 2019 - kukuk@suse.de
 
diff --git a/tumbleweed-busybox-image.kiwi b/tumbleweed-busybox-image.kiwi
index 04e43ae..82be8df 100644
--- a/tumbleweed-busybox-image.kiwi
+++ b/tumbleweed-busybox-image.kiwi
@@ -8,23 +8,23 @@
   <preferences>
     <type image="docker">
       <containerconfig
-	name="tumbleweed/busybox"
+	name="opensuse/busybox"
         tag="latest"
 	additionaltags="%PKG_VERSION%,%PKG_VERSION%-%RELEASE%"
         maintainer="Thorsten Kukuk &lt;kukuk@suse.com&gt;">
         <labels>
           <suse_label_helper:add_prefix prefix="org.opensuse.tumbleweed.busybox">
-            <label name="org.opencontainers.title" value="openSUSE Tumbleweed Busybox Container"/>
-            <label name="org.opencontainers.description" value="Small image containing busybox."/>
-            <label name="org.opencontainers.version" value="%PKG_VERSION%-%RELEASE%"/>
-            <label name="org.opencontainers.created" value="%BUILDTIME%"/>
+            <label name="org.opencontainers.image.title" value="openSUSE Busybox Container"/>
+            <label name="org.opencontainers.image.description" value="Small image containing busybox."/>
+            <label name="org.opencontainers.image.version" value="%PKG_VERSION%-%RELEASE%"/>
+            <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org/"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/tumbleweed/busybox:%PKG_VERSION%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/busybox:%PKG_VERSION%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>
-        <history author="Thorsten Kukuk &lt;kukuk@suse.com&gt;">openSUSE Tumbleweed Busybox Container</history>
+        <history author="Thorsten Kukuk &lt;kukuk@suse.com&gt;">openSUSE Busybox Container</history>
       </containerconfig>
     </type>
     <version>1.0.0</version>