diff --git a/_service b/_service
new file mode 100644
index 0000000..c2048cb
--- /dev/null
+++ b/_service
@@ -0,0 +1,3 @@
+<services>
+        <service mode="buildtime" name="kiwi_metainfo_helper"/>
+</services>
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 732810c..8d64765 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" displayname="openSUSE Leap 15.1 GNOME Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index b15b0da..73fff7a 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" displayname="openSUSE Leap 15.1 KDE Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 0db66e6..af2e822 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" displayname="openSUSE Leap 15.1 Rescue CD">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>opensuse@opensuse.org</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index de95d52..6565ebb 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Aug 16 06:58:23 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Use "openSUSE" bootsplash for leap
+
+-------------------------------------------------------------------
+Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Use %OS_VERSION_ID% for Leap version and add the
+  kiwi_metainfo_helper OBS service
+
 -------------------------------------------------------------------
 Fri Jul 26 12:08:16 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 1725f1d..7e35686 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 84c7b33..d4ca639 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -32,8 +32,10 @@ archive() {
 
 for distro in leap tumbleweed; do
 	distroname="openSUSE Tumbleweed"
+	bootsplash="bgrt"
 	if [ "${distro}" = "leap" ]; then
-		distroname="openSUSE Leap 15.1"
+		distroname="openSUSE Leap %OS_VERSION_ID%"
+		bootsplash="openSUSE"
 	fi
 
 	for flavor in gnome kde xfce x11; do
@@ -55,6 +57,7 @@ for distro in leap tumbleweed; do
 		     s#@NAME@#${name// /-}#g;\
 		     s#@DISPLAYNAME@#${name}#g;\
 		     s#@VOLID@#${name// /_}#g;\
+		     s#@BOOTSPLASH@#${bootsplash}#g;\
 		     s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi      
 	done
 done