diff --git a/NOTES.md b/NOTES.md
index ecebedd8..ad0de2c7 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -14,7 +14,7 @@
 - /lib64 -> usr/lib64
 - /media -> run/media
 - /mnt -> var/mnt
-- /opt
+- /opt -> var/opt
 - /part-future
 - /proc
 - /root -> var/root
diff --git a/cmd/mount-sys.go b/cmd/mount-sys.go
index 098f03bf..f9c1df3e 100644
--- a/cmd/mount-sys.go
+++ b/cmd/mount-sys.go
@@ -169,7 +169,6 @@ func mountOverlayMounts(rootLabel string, dryRun bool) error {
 
 	overlays := []overlayMount{
 		{"/etc", []string{"/etc"}, "/var/lib/abroot/etc/" + rootLabel, "/var/lib/abroot/etc/" + rootLabel + "-work"},
-		{"/opt", []string{"/opt"}, "/var/opt", "/var/opt-work"},
 	}
 
 	for _, overlay := range overlays {
diff --git a/core/integrity.go b/core/integrity.go
index 041d9146..93eaa876 100644
--- a/core/integrity.go
+++ b/core/integrity.go
@@ -29,6 +29,7 @@ var linksToRepair = [...][2]string{
 	{"usr/sbin", "sbin"},
 	{"var/home", "home"},
 	{"var/mnt", "mnt"},
+	{"var/opt", "opt"},
 	{"var/root", "root"},
 	{"var/srv", "srv"},
 	{"var/usrlocal", "usr/local"},