diff --git a/setup/automation/distributed-net-centos-search b/setup/automation/distributed-net-centos-search
index 7a0888fee..5f61edd52 100644
--- a/setup/automation/distributed-net-centos-search
+++ b/setup/automation/distributed-net-centos-search
@@ -49,7 +49,7 @@ MANAGERUPDATES=1
 MNIC=eth0
 # MSEARCH=
 MSRV=distributed-manager
-MSRVIP=10.66.166.52
+MSRVIP=10.66.166.72
 # MTU=
 # NIDS=Suricata
 # NODE_ES_HEAP_SIZE=
diff --git a/setup/automation/distributed-net-centos-sensor b/setup/automation/distributed-net-centos-sensor
index 91b9c24a9..23f32b319 100644
--- a/setup/automation/distributed-net-centos-sensor
+++ b/setup/automation/distributed-net-centos-sensor
@@ -49,7 +49,7 @@ MANAGERUPDATES=1
 MNIC=eth0
 # MSEARCH=
 MSRV=distributed-manager
-MSRVIP=10.66.166.52
+MSRVIP=10.66.166.72
 # MTU=
 # NIDS=Suricata
 # NODE_ES_HEAP_SIZE=
diff --git a/setup/so-setup b/setup/so-setup
index 8a2cb714c..ed0afe354 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -567,7 +567,7 @@ set_redirect >> $setup_log 2>&1
 		set_updates >> $setup_log 2>&1
 	fi
 
-	if [[ $is_manager && $is_airgap ]]; then
+	if [[ ( $is_manager || $is_import ) && $is_airgap ]]; then
 		info "Creating airgap repo"
 		create_repo >> $setup_log 2>&1
 		airgap_rules >> $setup_log 2>&1