diff --git a/common/Android.bp b/common/Android.bp
index 203e1c6..6d76f8d 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -167,7 +167,7 @@ prebuilt_etc {
 prebuilt_etc {
     name: "gms_fsverity_cert.der",
     src: "proprietary/product/etc/security/fsverity/gms_fsverity_cert.der",
-    relative_install_path: "security",
+    relative_install_path: "security/fsverity",
     filename_from_src: true,
     product_specific: true,
 }
diff --git a/setup-makefiles.py b/setup-makefiles.py
index 5706f9e..5c4f859 100755
--- a/setup-makefiles.py
+++ b/setup-makefiles.py
@@ -147,7 +147,7 @@ class prebuilt_etc(SoongPrebuilt):
         props = {
             "name": self.name,
             "src": self.src,
-            "relative_install_path": self.install_path.split("/", maxsplit=3)[-2],
+            "relative_install_path": "/".join(self.install_path.split("/")[2:-1]),
             "filename_from_src": True,
         }