diff --git a/policy/modules/services/postfix.if b/policy/modules/services/postfix.if
index 4440bbeec..a390bd6d8 100644
--- a/policy/modules/services/postfix.if
+++ b/policy/modules/services/postfix.if
@@ -683,13 +683,13 @@ interface(`postfix_admin',`
 		type postfix_initrc_exec_t, postfix_prng_t, postfix_etc_t;
 		type postfix_data_t, postfix_runtime_t, postfix_public_t;
 		type postfix_private_t, postfix_map_tmp_t, postfix_exec_t;
-		type postfix_keytab_t, postfix_t;
+		type postfix_keytab_t, postfix_master_t;
 	')
 
 	allow $1 postfix_domain:process { ptrace signal_perms };
 	ps_process_pattern($1, postfix_domain)
 
-	init_startstop_service($1, $2, postfix_t, postfix_initrc_exec_t)
+	init_startstop_service($1, $2, postfix_master_t, postfix_initrc_exec_t)
 
 	files_search_etc($1)
 	admin_pattern($1, { postfix_prng_t postfix_etc_t postfix_exec_t postfix_keytab_t })
diff --git a/policy/modules/services/spamassassin.if b/policy/modules/services/spamassassin.if
index 9fbae73d2..b530a76f8 100644
--- a/policy/modules/services/spamassassin.if
+++ b/policy/modules/services/spamassassin.if
@@ -72,10 +72,10 @@ template(`spamassassin_role',`
 #
 interface(`spamassassin_run_update',`
 	gen_require(`
-		type spamd_gpg_t, spamd_update_exec_t, spamd_update_t;
+		type spamd_update_t, spamd_update_exec_t, spamd_update_t;
 	')
 
-	role $2 types { spamd_gpg_t spamd_update_t };
+	role $2 types { spamd_update_t spamd_update_t };
 	domtrans_pattern($1, spamd_update_exec_t, spamd_update_t)
 ')
 
@@ -476,10 +476,10 @@ interface(`spamassassin_admin',`
 		type spamd_t, spamd_tmp_t, spamd_log_t;
 		type spamd_spool_t, spamd_var_lib_t, spamd_runtime_t;
 		type spamd_initrc_exec_t, spamassassin_unit_t;
-		type spamd_gpg_t, spamd_update_t, spamd_update_tmp_t;
+		type spamd_update_t, spamd_update_t, spamd_update_tmp_t;
 	')
 
-	admin_process_pattern($1, { spamd_t spamd_gpg_t spamd_update_t })
+	admin_process_pattern($1, { spamd_t spamd_update_t spamd_update_t })
 
 	init_startstop_service($1, $2, spamd_t, spamd_initrc_exec_t, spamassassin_unit_t)