diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index 5cee13b10..fe7e12135 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -499,6 +499,9 @@ role:
               - {{ portgroups.influxdb }}
               - {{ portgroups.elasticsearch_rest }}
               - {{ portgroups.elasticsearch_node }}
+          minion:
+            portgroups:
+              - {{ portgroups.docker_registry }}
           sensor:
             portgroups:
               - {{ portgroups.beats_5044 }}
diff --git a/setup/so-functions b/setup/so-functions
index 9bc2bacfd..fd2e88516 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1568,7 +1568,7 @@ set_initial_firewall_policy() {
 			$default_salt_dir/salt/common/tools/sbin/so-firewall --apply includehost minion "$MAINIP"
 			$default_salt_dir/pillar/data/addtotab.sh managertab "$MINION_ID" "$MAINIP" "$num_cpu_cores" "$random_uid" "$MNIC" "$filesystem_root" "$filesystem_nsm"
 			;;
-		'EVAL' | 'MANAGERSEARCH' | 'STANDALONE')
+		'EVAL' | 'MANAGERSEARCH' | 'STANDALONE' | 'IMPORTPCAP')
 			$default_salt_dir/salt/common/tools/sbin/so-firewall includehost manager "$MAINIP"
 			$default_salt_dir/salt/common/tools/sbin/so-firewall includehost minion "$MAINIP"
             $default_salt_dir/salt/common/tools/sbin/so-firewall includehost sensor "$MAINIP"
diff --git a/setup/so-setup b/setup/so-setup
index dd9e73b32..0994bad06 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -529,10 +529,8 @@ fi
 			set_progress_str 26 'Downloading containers from the internet'
 		fi
 
-
 		salt-call state.apply -l info registry >> $setup_log 2>&1
 		docker_seed_registry  2>> "$setup_log" # ~ 60% when finished
-
 		
 		set_progress_str 60 "$(print_salt_state_apply 'manager')"
 		salt-call state.apply -l info manager >> $setup_log 2>&1