diff --git a/SEPolicy.mk b/SEPolicy.mk
index 9d006a454..79af5e631 100644
--- a/SEPolicy.mk
+++ b/SEPolicy.mk
@@ -1,5 +1,5 @@
 # Board specific SELinux policy variable definitions
-SEPOLICY_PATH:= device/qcom/sepolicy_vndr
+SEPOLICY_PATH:= device/qcom/sepolicy_vndr/sm8450
 QSSI_SEPOLICY_PATH:= device/qcom/sepolicy
 BOARD_SYSTEM_EXT_PREBUILT_DIR := device/qcom/sepolicy/generic
 BOARD_PRODUCT_PREBUILT_DIR := device/qcom/sepolicy/generic/product
diff --git a/qva/vendor/ssg/keys.conf b/qva/vendor/ssg/keys.conf
index bfc08ca96..7baca807f 100644
--- a/qva/vendor/ssg/keys.conf
+++ b/qva/vendor/ssg/keys.conf
@@ -1,2 +1,2 @@
 [@SSG]
-ALL : device/qcom/sepolicy_vndr/qva/vendor/ssg/ssg_app_cert.x509.pem
+ALL : device/qcom/sepolicy_vndr/sm8450/qva/vendor/ssg/ssg_app_cert.x509.pem
diff --git a/qva/vendor/test/sysmonapp/keys.conf b/qva/vendor/test/sysmonapp/keys.conf
index 4626aff5c..fa69e87a5 100644
--- a/qva/vendor/test/sysmonapp/keys.conf
+++ b/qva/vendor/test/sysmonapp/keys.conf
@@ -25,4 +25,4 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 [@SYSMONAPP]
-ALL : device/qcom/sepolicy_vndr/qva/vendor/test/sysmonapp/sysmonapp_app_cert.x509.pem
+ALL : device/qcom/sepolicy_vndr/sm8450/qva/vendor/test/sysmonapp/sysmonapp_app_cert.x509.pem