diff --git a/salt/common/files/daemon.json b/salt/common/files/daemon.json
index bc047bc80..17d8e1c88 100644
--- a/salt/common/files/daemon.json
+++ b/salt/common/files/daemon.json
@@ -1,5 +1,5 @@
-{%- set DOCKERRANGE = salt['pillar.get']('docker:range') %}
-{%- set DOCKERBIND = salt['pillar.get']('docker:bip') %}
+{%- set DOCKERRANGE = salt['pillar.get']('docker:range'), '172.17.0.0/24' %}
+{%- set DOCKERBIND = salt['pillar.get']('docker:bip'), '172.17.0.1/24' %}
 {
     "registry-mirrors": [ "https://:5000" ],
     "bip": "{{ DOCKERBIND }}",
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 38e6a581d..4f8a00a82 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -291,7 +291,7 @@ rc3_to_2.3.0() {
   INSTALLEDVERSION=2.3.0
 }
 
-2.3.0_to_2.3.20(){
+2.3.0_to_2.3.20(){DOCKERSTUFFBIP=$(echo $DOCKERSTUFF | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
   # Remove PCAP from global
   sed '/pcap:/d' /opt/so/saltstack/local/pillar/global.sls
   sed '/sensor_checkin_interval_ms:/d' /opt/so/saltstack/local/pillar/global.sls
diff --git a/setup/so-functions b/setup/so-functions
index da452516d..b1668ef66 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1199,6 +1199,9 @@ manager_global() {
 
 	if [ -z "$DOCKERNET" ]; then
         DOCKERNET=172.17.0.0
+		DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
+	else
+	    DOCKERBIP=$(echo $DOCKERNET | awk -F'.' '{print $1,$2,$3,1}' OFS='.')/24
 	fi
 
 	# Create a global file for global values
@@ -1346,6 +1349,9 @@ manager_global() {
 		"  playbook:"\
 		"    rulesets:"\
 		"      - windows"\
+		"docker:"\
+		"  range: '$DOCKERNET/24'"\
+		"  bip: '$DOCKERBIP"
 		"redis_settings:"\
 		"  redis_maxmemory: 812" >> "$global_pillar"