diff --git a/start_geo.sh b/start_geo.sh
index 60f636e81d9321559a55727e5bd587e57a863458..3d71c6ea660100ba4483cc7f5f6fc88605060923 100755
--- a/start_geo.sh
+++ b/start_geo.sh
@@ -5,7 +5,7 @@
echo -ex
export G2G_PRODUCTS="C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 C13 C14 C15 C16 true_color_night"
-export BASE_REG="gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/cspp-geo-web-viewer"
+export BASE_REG="gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere"
docker network inspect cspp-geo-rabbit || docker network create cspp-geo-rabbit
@@ -22,20 +22,20 @@ docker exec cspp-geo-rabbit rabbitmqadmin declare exchange name=satellite type=t
TMP_DIR=/dev/shm/cspp_geo
mkdir -p ${TMP_DIR}
chmod 777 ${TMP_DIR}
-docker run -d --rm --name cspp-geo-grb-g16 -e LEFT_PORT=50060 -e RIGHT_PORT=50070 -e APID_FILTER=GOES-16-ABI-Only.xml -v ${TMP_DIR}:/data ${BASE_REG}/cspp_geo_grb:latest ./grb-wrapper.sh fanout1.ssec.wisc.edu
-docker run -d --rm --name cspp-geo-l1b-tmpwatch -v ${TMP_DIR}:/watch1 -v cspp-geo-l1b:/watch2 -e TIME_MODE=mmin ${BASE_REG}/tmpwatch:latest 1h +60 /watch1/product /watch2/product
-docker run -d --rm --name cspp-geo-grb-notify-g16 --network cspp-geo-rabbit -e RABBITMQ_HOST=cspp-geo-rabbit -e DST=/dst/product -e REMOVE_AFTER=1 -v ${TMP_DIR}:/data -v cspp-geo-l1b:/dst ${BASE_REG}/cspp_geo_grb_notify:latest ./grb-notify.sh /data/product
+docker run -d --rm --name cspp-geo-grb-g16 -e LEFT_PORT=50060 -e RIGHT_PORT=50070 -e APID_FILTER=GOES-16-ABI-Only.xml -v ${TMP_DIR}:/data ${BASE_REG}/cspp-geo-web-viewer/cspp_geo_grb:latest ./grb-wrapper.sh fanout1.ssec.wisc.edu
+docker run -d --rm --name cspp-geo-l1b-tmpwatch -v ${TMP_DIR}:/watch1 -v cspp-geo-l1b:/watch2 -e TIME_MODE=mmin ${BASE_REG}/cspp-geo-web-viewer/tmpwatch:latest 1h +60 /watch1/product /watch2/product
+docker run -d --rm --name cspp-geo-grb-notify-g16 --network cspp-geo-rabbit -e RABBITMQ_HOST=cspp-geo-rabbit -e DST=/dst/product -e REMOVE_AFTER=1 -v ${TMP_DIR}:/data -v cspp-geo-l1b:/dst ${BASE_REG}/cspp-geo-web-viewer/cspp_geo_grb_notify:latest ./grb-notify.sh /data/product
-docker run -d --rm --name cspp-geo-abi-l1b-geotiffs-tmpwatch -v cspp-geo-abi-l1b-geotiffs:/watch ${BASE_REG}/tmpwatch:latest 12h +1 /watch
-docker run --cpus 16 -d --rm --network cspp-geo-rabbit --name cspp-geo-geo2grid-g16-radf -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.netcdf.all.complete" -v cspp-geo-l1b:/data -v cspp-geo-abi-l1b-geotiffs:/dst ${BASE_REG}/cspp_geo_geo2grid:latest ./run.sh
-docker run --cpus 4 -d --rm --network cspp-geo-rabbit --name cspp-geo-geo2grid-g16-radm1 -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.radm1.l1b.netcdf.all.complete" -v cspp-geo-l1b:/data -v cspp-geo-abi-l1b-geotiffs:/dst ${BASE_REG}/cspp_geo_geo2grid:latest ./run.sh
+docker run -d --rm --name cspp-geo-abi-l1b-geotiffs-tmpwatch -v cspp-geo-abi-l1b-geotiffs:/watch ${BASE_REG}/cspp-geo-web-viewer/tmpwatch:latest 12h +1 /watch
+docker run --cpus 16 -d --rm --network cspp-geo-rabbit --name cspp-geo-geo2grid-g16-radf -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.netcdf.all.complete" -v cspp-geo-l1b:/data -v cspp-geo-abi-l1b-geotiffs:/dst ${BASE_REG}/cspp-geo-web-viewer/cspp_geo_geo2grid:latest ./run.sh
+docker run --cpus 4 -d --rm --network cspp-geo-rabbit --name cspp-geo-geo2grid-g16-radm1 -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.radm1.l1b.netcdf.all.complete" -v cspp-geo-l1b:/data -v cspp-geo-abi-l1b-geotiffs:/dst ${BASE_REG}/cspp-geo-web-viewer/cspp_geo_geo2grid:latest ./run.sh
-docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-all -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.*.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/tile_gen:latest ./run.sh
-#docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-radf -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/tile_gen:latest ./run.sh
-#docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-radm1 -e AMQPFIND_TOPIC="data.goes.g16.abi.radm1.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/tile_gen:latest ./run.sh
+docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-all -e G2G_PRODUCTS="$G2G_PRODUCTS" -e AMQPFIND_TOPIC="data.goes.g16.abi.*.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/cspp-geo-web-viewer/tile_gen:latest ./run.sh
+#docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-radf -e AMQPFIND_TOPIC="data.goes.g16.abi.radf.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/cspp-geo-web-viewer/tile_gen:latest ./run.sh
+#docker run -d --rm --network cspp-geo-rabbit --name cspp-geo-tilegen-g16-radm1 -e AMQPFIND_TOPIC="data.goes.g16.abi.radm1.l1b.geotiff.all.complete" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/cspp-geo-web-viewer/tile_gen:latest ./run.sh
-docker run -p 8888:80 -d --rm --network cspp-geo-rabbit --name cspp-geo-mapserver -e G2G_PRODUCTS="$G2G_PRODUCTS" -e WMS_PRODUCTS="$G2G_PRODUCTS true_color" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/mapserver:latest
+docker run -p 8888:80 -d --rm --network cspp-geo-rabbit --name cspp-geo-mapserver -e G2G_PRODUCTS="$G2G_PRODUCTS" -e WMS_PRODUCTS="$G2G_PRODUCTS true_color" -v cspp-geo-abi-l1b-geotiffs:/data ${BASE_REG}/cspp-geo-web-viewer/mapserver:latest
-docker run -d --rm --name cspp-geo-tile-cache-tmpwatch -v cspp-geo-tile-cache:/watch ${BASE_REG}/tmpwatch 12h +1 /watch
-docker run -d --rm --name cspp-geo-mapcache-timedb --network cspp-geo-rabbit -e G2G_PRODUCTS="$G2G_PRODUCTS" -e MAPCACHE_PRODUCTS="$G2G_PRODUCTS true_color" -e MAPCACHE_SECTORS="radf radm1" -e MAPCACHE_SEED=1 -e MAPCACHE_SEED_ARGS="-z 0,2" -v cspp-geo-tile-cache:/data ${BASE_REG}/mapcache_timedb:latest ./updater.sh cspp-geo-mapserver 80
-docker run -p 8889:80 -d --rm --name cspp-geo-mapcache1 --network cspp-geo-rabbit -e G2G_PRODUCTS="$G2G_PRODUCTS" -e MAPCACHE_PRODUCTS="$G2G_PRODUCTS true_color" -e MAPCACHE_SECTORS="radf radm1" -v cspp-geo-tile-cache:/data ${BASE_REG}/mapcache:latest ./run.sh cspp-geo-mapserver 80
+docker run -d --rm --name cspp-geo-tile-cache-tmpwatch -v cspp-geo-tile-cache:/watch ${BASE_REG}/cspp-geo-web-viewer/tmpwatch 12h +1 /watch
+docker run -d --rm --name cspp-geo-mapcache-timedb --network cspp-geo-rabbit -e G2G_PRODUCTS="$G2G_PRODUCTS" -e MAPCACHE_PRODUCTS="$G2G_PRODUCTS true_color" -e MAPCACHE_SECTORS="radf radm1" -e MAPCACHE_SEED=1 -e MAPCACHE_SEED_ARGS="-z 0,2" -v cspp-geo-tile-cache:/data ${BASE_REG}/cspp-geo-web-viewer/mapcache_timedb:latest ./updater.sh cspp-geo-mapserver 80
+docker run -p 8889:80 -d --rm --name cspp-geo-mapcache1 --network cspp-geo-rabbit -e G2G_PRODUCTS="$G2G_PRODUCTS" -e MAPCACHE_PRODUCTS="$G2G_PRODUCTS true_color" -e MAPCACHE_SECTORS="radf radm1" -v cspp-geo-tile-cache:/data ${BASE_REG}/cspp-geo-web-viewer/mapcache:latest ./run.sh cspp-geo-mapserver 80