diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py
index 34b959a12910fb111f99567979dc4a456b05f653..717596c5744025f9c5b7f2edfa7ca4a56ad59e50 100644
--- a/src/modules/mhwdcfg/main.py
+++ b/src/modules/mhwdcfg/main.py
@@ -75,7 +75,7 @@ class MhwdController:
     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])
 
@@ -83,7 +83,7 @@ class MhwdController:
         target_env_call(cmd)
 
         if self.local:
-            self.umount("opt")
+            self.umount("opt/mhwd")
             self.umount("var/lib/mhwd")
         self.umount("etc/resolv.conf")
 
diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf
index 18db7fbeabe4c3eb8088244314980af39e6eb325..1233ab9bb1f4f527faf34a6a21570cc13aa0902e 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