diff --git a/setup/so-setup b/setup/so-setup
index d059376b9..be5421895 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -401,11 +401,14 @@ fi
 	set_progress_str 21 'Copying minion pillars to master'
 	copy_minion_tmp_files >> $setup_log 2>&1
 
+	if [[ $is_master ]]; then
+	    addtotab_generate_templates >> $setup_log 2>&1
+	fi
+
 	set_progress_str 22 'Generating CA and checking in'
 	salt_checkin >> $setup_log 2>&1
 
 	if [[ $is_master || $is_helix ]]; then
-	    addtotab_generate_templates >> $setup_log 2>&1
 		set_progress_str 25 'Configuring firewall'
 		set_initial_firewall_policy >> $setup_log 2>&1