diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index ad99e0f..4bfa168 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov  2 20:24:08 CET 2019 - kukuk@suse.de
+
+- Adjust %PKG_VERSION%-0 tagging to be compatible with future
+  kubernetes versions
+
 -------------------------------------------------------------------
 Thu Oct 10 12:47:55 UTC 2019 - Richard Brown <rbrown@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 1db4fde..8aa1a03 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -15,7 +15,7 @@
       <containerconfig
         name="kubic/etcd"
         tag="latest"
-        additionaltags="%PKG_VERSION%,%PKG_VERSION%-%RELEASE%,%PKG_VERSION%-0"
+        additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%"
         maintainer="Thorsten Kukuk &lt;kukuk@suse.com&gt;">
         <expose>
           <port number="2379"/>