diff --git a/common/tooling/apparmor/apparmor-d-package.nix b/common/tooling/apparmor/apparmor-d-package.nix
index 41ae8e7..111eda5 100644
--- a/common/tooling/apparmor/apparmor-d-package.nix
+++ b/common/tooling/apparmor/apparmor-d-package.nix
@@ -21,15 +21,18 @@ buildGoModule {
     ./apparmor-d-paths.patch
   ];
 
+  subPackages = [
+    "cmd/prebuild"
+    "cmd/aa-log"
+  ];
+
   postInstall = ''
-    mkdir -p $out/etc build/apparmor.d
+    mkdir -p $out/etc
     
-    rm $out/bin/cmd $out/bin/aa
-    mv $out/bin/prebuild build/prebuild
-    
-    DISTRIBUTION=arch ./build/prebuild --complain --abi 4 # fixme: replace with nixos support once available
+    DISTRIBUTION=arch $out/bin/prebuild --complain --abi 4 # fixme: replace with nixos support once available
     
     mv .build/apparmor.d $out/etc
+    rm $out/bin/prebuild
   '';
 
   meta = {