diff --git a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
index 740c3b33..769ff45e 100755
--- a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
+++ b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent
@@ -82,7 +82,7 @@ profilename=${profilename#profile: }
 proto=$(grep ^protocol: /tmp/confluent.deploycfg)
 proto=${proto#protocol: }
 
-echo "<media_url>${proto}://${mgr}/confluent-public/os/${profilename}/distribution/2</media_url>" > /tmp/pkgurl
+echo "<media_url>${proto}://${mgr}/confluent-public/os/${profilename}/product</media_url>" > /tmp/pkgurl
 
 echo "AutoYaST: $proto://$mgr/confluent-public/os/$profilename/autoyast" >> /etc/linuxrc.d/01-confluent
 echo "Install: $proto://$mgr/confluent-public/os/$profilename/distribution/1" >> /etc/linuxrc.d/01-confluent
diff --git a/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh b/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
index 7fddaea5..b4cd704a 100644
--- a/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
+++ b/confluent_osdeploy/suse15/profiles/hpc/initprofile.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
+discnum=$(basename $1)
+if [ "$discnum" != 1 ]; then exit 0; fi
 if [ -e $2/boot/kernel ]; then exit 0; fi
+if ls $1/Product-* >& /dev/null; then
+	ln -s $1 $2/product
+else
+	ln -s ${1%1}2 $2/product
+fi
 sed -i 's/sle 15/SUSE Linux Enterprise 15/; s/opensuse_leap/openSUSE Leap/' $2/profile.yaml
 ln -s $1/boot/x86_64/loader/linux $2/boot/kernel && \
 ln -s $1/boot/x86_64/loader/initrd $2/boot/initramfs/distribution && \
diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py
index 5b617e9a..298d46ff 100644
--- a/confluent_server/confluent/osimage.py
+++ b/confluent_server/confluent/osimage.py
@@ -199,7 +199,7 @@ def check_sles(isoinfo):
             distro = 'opensuse_leap'
         else:
             distro = 'sle'
-        if hline[0] == '/':
+        if hline[0] == '/' or 'boot' in isoinfo[0]:
             disk = '1'
         elif hline[0].startswith('/Module'):
             disk = '2'