diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index 34ea11ddd..af79d1bb9 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -1,7 +1,6 @@
 ---
-# Gummiboot configuration files settings, set preferred distribution name and amount of time before 
-# default selection boots
-distribution: KaOS-kf5
+# Gummiboot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
 kernel: /vmlinuz-linux
 img: /initramfs-linux.img
 fallback: /initramfs-linux-fallback.img
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index e868fd948..50ae9d773 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -53,7 +53,8 @@ def get_uuid():
 
 
 def create_conf(uuid, conf_path):
-    distribution = libcalamares.job.configuration["distribution"]
+    branding = libcalamares.globalstorage.value("branding")
+    distribution = branding["productName"]
     kernel = libcalamares.job.configuration["kernel"]
     img = libcalamares.job.configuration["img"]
     partitions = libcalamares.globalstorage.value("partitions")
@@ -79,7 +80,8 @@ def create_conf(uuid, conf_path):
 
 
 def create_fallback(uuid, fallback_path):
-    distribution = libcalamares.job.configuration["distribution"]
+    branding = libcalamares.globalstorage.value("branding")
+    distribution = branding["productName"]
     kernel = libcalamares.job.configuration["kernel"]
     fb_img = libcalamares.job.configuration["fallback"]
     partitions = libcalamares.globalstorage.value("partitions")
@@ -105,7 +107,8 @@ def create_fallback(uuid, fallback_path):
 
 
 def create_loader(loader_path):
-    distribution = libcalamares.job.configuration["distribution"]
+    branding = libcalamares.globalstorage.value("branding")
+    distribution = branding["productName"]
     timeout = libcalamares.job.configuration["timeout"]
     lines = [
         'timeout %s\n' % timeout,
@@ -122,7 +125,8 @@ def install_bootloader(boot_loader, fw_type):
     if fw_type == 'efi':
         install_path = libcalamares.globalstorage.value("rootMountPoint")
         uuid = get_uuid()
-        distribution = libcalamares.job.configuration["distribution"]
+        branding = libcalamares.globalstorage.value("branding")
+        distribution = branding["productName"]
         conf_path = os.path.join(
             install_path, "boot", "loader", "entries", "%s.conf" % distribution)
         fallback_path = os.path.join(