diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval
index a0b3a39de..b5cf6ef5a 100644
--- a/salt/common/nginx/nginx.conf.so-eval
+++ b/salt/common/nginx/nginx.conf.so-eval
@@ -152,10 +152,7 @@ http {
         }
 
         location /fleet/ {
-          auth_basic            "Security Onion";
-          auth_basic_user_file  /opt/so/conf/nginx/.htpasswd;
-	  rewrite /fleet/(.*) /$1 break;
-          proxy_pass https://{{ masterip }}:8080/;
+          proxy_pass https://{{ masterip }}:8080/fleet/;
           proxy_read_timeout    90;
           proxy_connect_timeout 90;
           proxy_set_header      Host $host;
diff --git a/salt/fleet/so-fleet-setup.sh b/salt/fleet/so-fleet-setup.sh
index 5f6dcb949..32bbddbe7 100644
--- a/salt/fleet/so-fleet-setup.sh
+++ b/salt/fleet/so-fleet-setup.sh
@@ -7,7 +7,7 @@ fi
 
 initpw=$(date +%s | sha256sum | base64 | head -c 16 ; echo)
 
-docker exec so-fleet fleetctl config set --address https://$1:443 --tls-skip-verify
+docker exec so-fleet fleetctl config set --address https://$1:443 --tls-skip-verify --url-prefix /fleet
 docker exec so-fleet fleetctl setup --email $2 --password $initpw
 
 docker exec so-fleet fleetctl apply -f /packs/palantir/Fleet/Endpoints/options.yaml