diff --git a/device.mk b/device.mk
index b936cb7..356e30b 100644
--- a/device.mk
+++ b/device.mk
@@ -164,7 +164,7 @@ PRODUCT_PACKAGES += \
 
 # Gatekeeper
 PRODUCT_PACKAGES += \
-    android.hardware.gatekeeper@1.0-service.software
+    com.android.hardware.gatekeeper.nonsecure
 
 # Graphics
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 4cba698..84e7db5 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -14,9 +14,6 @@
 # FFmpeg
 /vendor/bin/hw/android\.hardware\.media\.c2@1\.2-service-ffmpeg              u:object_r:mediacodec_exec:s0
 
-# Gatekeeper
-/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software          u:object_r:hal_gatekeeper_default_exec:s0
-
 # Graphics
 /dev/dri                                                                                u:object_r:gpu_device:s0
 /dev/dri/card0                                                                          u:object_r:gpu_device:s0
diff --git a/sepolicy/keystore.te b/sepolicy/keystore.te
new file mode 100644
index 0000000..287151b
--- /dev/null
+++ b/sepolicy/keystore.te
@@ -0,0 +1 @@
+hal_client_domain(keystore, hal_gatekeeper)
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 0638150..5962f1d 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1,2 +1,3 @@
 android.hardware.drm.IDrmFactory/widevine                                    u:object_r:hal_drm_service:s0
+android.hardware.security.sharedsecret.ISharedSecret/gatekeeper              u:object_r:hal_gatekeeper_service:s0
 mapper/minigbm_gbm_mesa                                                      u:object_r:hal_graphics_mapper_service:s0