diff --git a/live/root/etc/zypp/repos.d/agama-SLES.repo b/live/root/etc/zypp/repos.d/agama-SLES.repo
new file mode 100644
index 0000000000..2c31f7efe1
--- /dev/null
+++ b/live/root/etc/zypp/repos.d/agama-SLES.repo
@@ -0,0 +1,8 @@
+[agama-SLES]
+name=Agama (SLES)
+type=rpm-md
+enabled=0
+autorefresh=1
+gpgcheck=1
+baseurl=http://download.suse.de/ibs/Devel:/YaST:/Agama:/Head/SLES-16.0/
+gpgkey=http://download.suse.de/ibs/Devel:/YaST:/Agama:/Head/SLES-16.0/repodata/repomd.xml.key
diff --git a/live/root/etc/zypp/repos.d/agama-devel.repo b/live/root/etc/zypp/repos.d/agama-openSUSE_Tumbleweed.repo
similarity index 77%
rename from live/root/etc/zypp/repos.d/agama-devel.repo
rename to live/root/etc/zypp/repos.d/agama-openSUSE_Tumbleweed.repo
index fd862c4b4a..6ac8b482dd 100644
--- a/live/root/etc/zypp/repos.d/agama-devel.repo
+++ b/live/root/etc/zypp/repos.d/agama-openSUSE_Tumbleweed.repo
@@ -1,7 +1,7 @@
-[agama-devel]
-name=Agama-Devel
+[agama-openSUSE_Tumbleweed]
+name=Agama-Devel (openSUSE Tumbleweed)
 type=rpm-md
-enabled=1
+enabled=0
 autorefresh=1
 gpgcheck=1
 baseurl=https://download.opensuse.org/repositories/systemsmanagement:/Agama:/Devel/openSUSE_Tumbleweed/
diff --git a/live/src/config.sh b/live/src/config.sh
index 695c8813d7..0d88949c72 100644
--- a/live/src/config.sh
+++ b/live/src/config.sh
@@ -12,6 +12,13 @@ echo "Configure image: [$kiwi_iname]..."
 # setup baseproduct link
 suseSetupProduct
 
+# enable the corresponding repository
+DISTRO=$(grep "^NAME" /etc/os-release | cut -f2 -d\= | tr -d '"' | tr " " "_")
+REPO="agama-${DISTRO}"
+if zypper lr $REPO; then
+  zypper mr --enable $REPO
+fi
+
 # configure the repositories in the Live system
 # import the OBS key for the systemsmanagement OBS project
 rpm --import /tmp/systemsmanagement_key.gpg