diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index 960d5fc7ff2f0604e5c83cbef9bbd90d076fb87c..690b47f04d491c6121903c06449f131a99bb033f 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -35,6 +35,9 @@
     flags_health_check_exec
     fwk_bufferhub_hwservice
     fwk_stats_hwservice
+    gsi_service
+    gsid
+    gsid_exec
     color_display_service
     hal_atrace_hwservice
     hal_face_hwservice
diff --git a/private/file_contexts b/private/file_contexts
index dfdcc1bd256217b5717807a4a87470c16033f3a3..0605ee49555fbc8e5a1938f7e523bb2ef5de813a 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -310,6 +310,7 @@
 /system/bin/wait_for_keymaster   u:object_r:wait_for_keymaster_exec:s0
 /system/bin/watchdogd            u:object_r:watchdogd_exec:s0
 /system/bin/apexd                u:object_r:apexd_exec:s0
+/system/bin/gsid                 u:object_r:gsid_exec:s0
 
 #############################
 # Vendor files
diff --git a/private/gsid.te b/private/gsid.te
new file mode 100644
index 0000000000000000000000000000000000000000..5ac1c2521437ad8b0c93f515e0bbb097bfb95801
--- /dev/null
+++ b/private/gsid.te
@@ -0,0 +1,10 @@
+# gsid - Manager for GSI Installation
+
+type gsid, domain;
+type gsid_exec, exec_type, file_type, system_file_type;
+typeattribute gsid coredomain;
+
+init_daemon_domain(gsid)
+
+binder_use(gsid)
+add_service(gsid, gsi_service)
diff --git a/private/service.te b/private/service.te
index 3fec8825a777cbcd7c68feb024999a109ffeab08..fc9a95a395c31270a38064b6e03d0aa77c3c1f72 100644
--- a/private/service.te
+++ b/private/service.te
@@ -1,2 +1,3 @@
+type gsi_service,               service_manager_type;
 type stats_service, service_manager_type;
 type statscompanion_service, system_server_service, service_manager_type;
diff --git a/private/service_contexts b/private/service_contexts
index a548883a6e2738076744a06db97abf87ec41cdeb..82c94f92f7e7912bd5ea861609a0b1b0590ffa0a 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -10,6 +10,7 @@ android.service.gatekeeper.IGateKeeperService    u:object_r:gatekeeper_service:s
 app_binding                               u:object_r:app_binding_service:s0
 app_prediction                            u:object_r:app_prediction_service:s0
 apexservice                               u:object_r:apex_service:s0
+gsiservice                                u:object_r:gsi_service:s0
 appops                                    u:object_r:appops_service:s0
 appwidget                                 u:object_r:appwidget_service:s0
 assetatlas                                u:object_r:assetatlas_service:s0