diff --git a/apparmor.d/tunables/etc.d/apparmor.d b/apparmor.d/tunables/multiarch.d/apparmor.d
similarity index 100%
rename from apparmor.d/tunables/etc.d/apparmor.d
rename to apparmor.d/tunables/multiarch.d/apparmor.d
diff --git a/cmd/prebuild/prepare.go b/cmd/prebuild/prepare.go
index 4a29167f..2b37be3a 100644
--- a/cmd/prebuild/prepare.go
+++ b/cmd/prebuild/prepare.go
@@ -163,7 +163,7 @@ func Configure() error {
 }
 
 func setLibexec() error {
-	file, err := RootApparmord.Join("tunables", "etc.d", "apparmor.d").Append()
+	file, err := RootApparmord.Join("tunables", "multiarch.d", "apparmor.d").Append()
 	if err != nil {
 		return err
 	}
diff --git a/dists/debian/tunables/etc b/dists/debian/tunables/multiarch.d/etc
similarity index 87%
rename from dists/debian/tunables/etc
rename to dists/debian/tunables/multiarch.d/etc
index 8cfbdd40..54cb94bf 100644
--- a/dists/debian/tunables/etc
+++ b/dists/debian/tunables/multiarch.d/etc
@@ -19,7 +19,3 @@
 
 # @{etc_rw} contains directories where writing to configuration files is allowed.
 @{etc_rw}=/etc/
-
-# Also, include files in tunables/etc.d/ for site-specific adjustments to
-# @{etc_ro} and @{etc_rw}.
-include if exists <tunables/etc.d>
\ No newline at end of file