diff --git a/_service:product_converter:openSUSE-cd-mini-i586.kiwi b/_service:product_converter:openSUSE-cd-mini-i586.kiwi
index 9af69de1..21de8897 100644
--- a/_service:product_converter:openSUSE-cd-mini-i586.kiwi
+++ b/_service:product_converter:openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180603" schemaversion="4.1">
+<image name="OBS__openSUSE___20180604" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,9 +32,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180603</productvar>
+      <productvar name="VERSION">20180604</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180603,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180604,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi b/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
index f510da9f..cd960b26 100644
--- a/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180603" schemaversion="4.1">
+<image name="OBS__openSUSE___20180604" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180603</productvar>
+      <productvar name="VERSION">20180604</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180603,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180604,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
index 9cdba200..7d818706 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180603" schemaversion="4.1">
+<image name="OBS__openSUSE___20180604" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,9 +32,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180603</productvar>
+      <productvar name="VERSION">20180604</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180603,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180604,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
index 35dfc180..fb982128 100644
--- a/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/_service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180603" schemaversion="4.1">
+<image name="OBS__openSUSE___20180604" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,9 +35,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180603</productvar>
+      <productvar name="VERSION">20180604</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180603,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180604,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
diff --git a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
index e92d5561..e38cc633 100644
--- a/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/_service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20180603" schemaversion="4.1">
+<image name="OBS__openSUSE___20180604" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -24,7 +24,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20180603-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20180604-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,9 +36,9 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20180603</productvar>
+      <productvar name="VERSION">20180604</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180603,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180604,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
diff --git a/_service:product_converter:openSUSE-release.spec b/_service:product_converter:openSUSE-release.spec
index 6786c256..17559b5e 100644
--- a/_service:product_converter:openSUSE-release.spec
+++ b/_service:product_converter:openSUSE-release.spec
@@ -20,7 +20,7 @@
 #define betaversion %{nil}
 %define codename Tumbleweed
 Name:           openSUSE-release
-Version:        20180603
+Version:        20180604
 Release:        0
 # 0 is the product release, not the build release of this package
 Summary:        openSUSE Tumbleweed
@@ -51,7 +51,7 @@ Provides:       product-update() = dup
 Obsoletes:      aaa_version
 Obsoletes:      openSUSE-Promo-release <= 11.1
 Obsoletes:      openSUSE-release-live <= 11.0
-Obsoletes:      product_flavor(%{product}) < 20180603
+Obsoletes:      product_flavor(%{product}) < 20180604
 # bnc#826592
 Provides:       weakremover(kernel-default) < 3.11
 Provides:       weakremover(kernel-desktop) < 4.2
@@ -61,7 +61,7 @@ Provides:       weakremover(kernel-vanilla) < 3.11
 Provides:       weakremover(kernel-xen) < 3.11
 Provides:       %name-%version
 Provides:       product() = openSUSE
-Provides:       product(openSUSE) = 20180603-0
+Provides:       product(openSUSE) = 20180604-0
 %ifarch x86_64
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
 %endif
@@ -75,7 +75,7 @@ Provides:       product-register-target() = openSUSE%2DTumbleweed%2Dppc64le
 Provides:       product-register-target() = openSUSE%2DTumbleweed%2Daarch64
 %endif
 Provides:       product-label() = openSUSE
-Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180603
+Provides:       product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180604
 Provides:       product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
 Provides:       product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
 Requires:       product_flavor(openSUSE)
@@ -17107,7 +17107,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(ftp)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description ftp
@@ -17122,7 +17122,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(mini)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description mini
@@ -17137,7 +17137,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(dvd)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description dvd
@@ -17152,7 +17152,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-kde)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-kde
@@ -17167,7 +17167,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-x11)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-x11
@@ -17182,7 +17182,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(livecd-gnome)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description livecd-gnome
@@ -17197,7 +17197,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-kde)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-kde
@@ -17212,7 +17212,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-gnome)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-gnome
@@ -17227,7 +17227,7 @@ License:        BSD-3-Clause
 Group:          System/Fhs
 Provides:       product_flavor()
 Provides:       flavor(usb-x11)
-Provides:       product_flavor(openSUSE) = 20180603-0
+Provides:       product_flavor(openSUSE) = 20180604-0
 Summary:        openSUSE Tumbleweed
 
 %description usb-x11
@@ -17300,10 +17300,10 @@ cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE.prod << EOF
 <product schemeversion="0">
   <vendor>openSUSE</vendor>
   <name>openSUSE</name>
-  <version>20180603</version>
+  <version>20180604</version>
   <release>0</release>
   <arch>%{_target_cpu}</arch>
-  <cpeid>cpe:/o:opensuse:opensuse:20180603</cpeid>
+  <cpeid>cpe:/o:opensuse:opensuse:20180604</cpeid>
   <productline>openSUSE</productline>
   <register>
     <pool>
diff --git a/openSUSE.product b/openSUSE.product
index 5bdda2bf..1365686d 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
 	<vendor>openSUSE</vendor>
         <name>openSUSE</name>
-        <version>20180603</version>
+        <version>20180604</version>
         <release>0</release>
 
         <productline>openSUSE</productline>