diff --git a/_service b/_service
index d8be25b..89cd0fd 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
         <param name="file">kubic-etcd-image.kiwi</param>
         <param name="regex">%PKG_VERSION%</param>
         <param name="parse-version">patch</param>
-        <param name="package">etcd-for-k8s-image</param>
+        <param name="package">kubernetes-etcd</param>
     </service>
     <service mode="buildtime" name="kiwi_label_helper"/>
 </services>
diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index 3919b3c..fd6ba0b 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep  2 11:30:06 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- add %PKG_VERSION%-1 tag to work with hardcoded kubernetes tag requirements
+
+-------------------------------------------------------------------
+Tue Sep  1 15:44:31 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- Rework package to use kubernetes-etcd metapackage 
+
 -------------------------------------------------------------------
 Fri Nov  8 22:09:48 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 8aa1a03..f845eb8 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -4,8 +4,8 @@
 
 <image schemaversion="6.9" name="kubic-etcd-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
-    <author>Thorsten Kukuk</author>
-    <contact>kukuk@suse.com</contact>
+    <author>Richard Brown</author>
+    <contact>rbrown@suse.com</contact>
     <specification>Image containing etcd for openSUSE Kubic.</specification>
   </description>
   <preferences>
@@ -15,8 +15,8 @@
       <containerconfig
         name="kubic/etcd"
         tag="latest"
-        additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%"
-        maintainer="Thorsten Kukuk &lt;kukuk@suse.com&gt;">
+        additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%,%PKG_VERSION%-1,%PKG_VERSION%-1.%RELEASE%"
+        maintainer="Richard Brown &lt;rbrown@suse.com&gt;">
         <expose>
           <port number="2379"/>
           <port number="2380"/>
@@ -34,7 +34,7 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>
-        <history author="Thorsten Kukuk &lt;kukuk@suse.com&gt;">openSUSE Kubic etcd container</history>
+        <history author="Richard Brown &lt;rbrown@suse.com&gt;">openSUSE Kubic etcd container</history>
       </containerconfig>
     </type>
     <version>1.0.0</version>
@@ -45,7 +45,7 @@
     <source path="obsrepositories:/"/>
   </repository>
   <packages type="bootstrap">
-    <package name="etcd-for-k8s-image"/>
+    <package name="kubernetes-etcd"/>
     <!-- package name="kubernetes-etcd-migrate"/ -->
   </packages>
 </image>