diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py
index 7ae532dd1..717596c57 100644
--- a/src/modules/mhwdcfg/main.py
+++ b/src/modules/mhwdcfg/main.py
@@ -70,19 +70,21 @@ class MhwdController:
         call(["umount", "-l", join(self.root, mp)])
 
     def mount(self, mp):
-        call(["mount", "-Br", "/" + mp, join(self.root, mp)])
+        call(["mount", "-B", "/" + mp, join(self.root, mp)])
 
     def configure(self, name, id):
         cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)]
         if self.local:
-            self.mount("opt")
+            self.mount("opt/mhwd")
+            self.mount("var/lib/mhwd")
             cmd.extend(["--pmconfig", self.repo])
 
         self.mount("etc/resolv.conf")
         target_env_call(cmd)
 
         if self.local:
-            self.umount("opt")
+            self.umount("opt/mhwd")
+            self.umount("var/lib/mhwd")
         self.umount("etc/resolv.conf")
 
     def run(self):
diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
index 18db7fbea..1233ab9bb 100644
--- a/src/modules/mhwdcfg/mhwdcfg.conf
+++ b/src/modules/mhwdcfg/mhwdcfg.conf
@@ -16,4 +16,4 @@ driver: free
 
 local: true
 
-repo: /opt/pacman-mhwd.conf
+repo: /opt/mhwd/pacman-mhwd.conf
diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py
index d847df73f..89182b927 100644
--- a/src/modules/postcfg/main.py
+++ b/src/modules/postcfg/main.py
@@ -66,7 +66,7 @@ class ConfigController:
         subprocess.call(["umount", "-l", join(self.root, mp)])
 
     def mount(self, mp):
-        subprocess.call(["mount", "-Br", "/" + mp, join(self.root, mp)])
+        subprocess.call(["mount", "-B", "/" + mp, join(self.root, mp)])
 
     def run(self):
         self.init_keyring()
@@ -116,12 +116,12 @@ class ConfigController:
         if not office_package:
             libcalamares.utils.warning("no office suite selected, {!s}".format(office_package))
         else:
-            # For PoC we added the Office Packages to mhwd-live overlay in 18.1-rc7
-            cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/pacman-mhwd.conf" ]
-            self.mount("opt")
+            # For PoC we added the Office Packages to mhwd-live overlay in 18.1.0
+            cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/mhwd/pacman-mhwd.conf" ]
+            self.mount("opt/mhwd")
             self.mount("etc/resolv.conf")
             target_env_call(cmd)
-            self.umount("opt")
+            self.umount("opt/mhwd")
             self.umount("etc/resolv.conf")
 
         return None