diff --git a/gatekeeperd.te b/gatekeeperd.te
index dfb2c7fc32ce9128c37f682f3e92a57c2e423806..5cc7ceaf0ad4587929750814aaeb82426ffa4ffa 100644
--- a/gatekeeperd.te
+++ b/gatekeeperd.te
@@ -4,13 +4,14 @@ type gatekeeperd_exec, exec_type, file_type;
 # gatekeeperd
 init_daemon_domain(gatekeeperd)
 binder_use(gatekeeperd)
-binder_service(gatekeeperd)
 allow gatekeeperd tee_device:chr_file rw_file_perms;
 
 # need to find KeyStore and add self
 allow gatekeeperd gatekeeper_service:service_manager { add find };
 
 # Need to add auth tokens to KeyStore
+allow gatekeeperd keystore_service:service_manager find;
+binder_call(gatekeeperd, keystore)
 allow gatekeeperd keystore:keystore_key { add_auth };
 
 # For permissions checking
@@ -19,3 +20,4 @@ allow gatekeeperd permission_service:service_manager find;
 
 neverallow { domain -gatekeeperd -system_server } gatekeeper_service:service_manager find;
 neverallow { domain -gatekeeperd } gatekeeper_service:service_manager add;
+neverallow { domain -system_server } gatekeeperd:binder call;
diff --git a/system_server.te b/system_server.te
index 5f1a7e2059655d074a82c43ce2a0eeb208d73e3f..9691cfbe587cbf27085a02d7d3812df01783b6fa 100644
--- a/system_server.te
+++ b/system_server.te
@@ -122,6 +122,7 @@ allow system_server surfaceflinger:unix_stream_socket { read write setopt };
 # Perform Binder IPC.
 binder_use(system_server)
 binder_call(system_server, binderservicedomain)
+binder_call(system_server, gatekeeperd)
 binder_call(system_server, appdomain)
 binder_call(system_server, dumpstate)
 binder_service(system_server)