diff --git a/README.md b/README.md
index ef42811..26e52b4 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ docker login
 
 pwsh cluedin.ps1 up
 
-open http://app.127.0.0.1.xip.io
+open http://app.127.0.0.1.nip.io
 ```
 
 ## Using the Docker helper script
diff --git a/docker/compose/docker-compose.micro.yml b/docker/compose/docker-compose.micro.yml
index 344d1ea..ed55447 100644
--- a/docker/compose/docker-compose.micro.yml
+++ b/docker/compose/docker-compose.micro.yml
@@ -3,7 +3,7 @@ services:
   clean:
     image: cluedin/cluedin-micro-clean:${CLUEDIN_CLEAN_TAG}
     environment:
-    - RabbitMQ_CS=amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
+    - RabbitMQ_CS=amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
     - ElasticURL=http://${CLUEDIN_ELASTIC_HOST:-elasticsearch}:9200
     - SeqURL=http://${CLUEDIN_SEQ_HOST:-seq}:5341
     - SeqLoggingLevel=debug
@@ -29,7 +29,7 @@ services:
   annotation:
     image: cluedin/cluedin-micro-annotation:${CLUEDIN_ANNOTATION_TAG}
     environment:
-    - RabbitMQ_CS=amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
+    - RabbitMQ_CS=amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
     - DbHost=${CLUEDIN_SQLSERVER_HOST}
     - DbPassword=${CLUEDIN_SQLSERVER_PASS}
     - DbUserName=${CLUEDIN_SQLSERVER_USER}
@@ -49,7 +49,7 @@ services:
   datasource:
     image: cluedin/cluedin-micro-datasource:${CLUEDIN_DATASOURCE_TAG}
     environment:
-    - RabbitMQ_CS=amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
+    - RabbitMQ_CS=amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
     - ElasticURL=http://${CLUEDIN_ELASTIC_HOST:-elasticsearch}:9200
     - DbName=${CLUEDIN_DATASOURCE_DBNAME:-DataStore.Db.MicroServices}
     - DbHost=${CLUEDIN_SQLSERVER_HOST}
@@ -74,7 +74,7 @@ services:
     image: cluedin/cluedin-micro-submitter:${CLUEDIN_SUBMITTER_TAG}
     environment:
       CluedIn_API_URL: "http://${CLUEDIN_SERVER_HOST:-server}:9007/"
-      RabbitMQ_URL: "amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672"
+      RabbitMQ_URL: "amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672"
       Serilog__WriteTo__1__Name: Seq
       Serilog__WriteTo__1__Args__serverUrl: http://${CLUEDIN_SEQ_HOST:-seq}:5341
       # needs $$ to escape the dollar sign
diff --git a/docker/compose/docker-compose.server.yml b/docker/compose/docker-compose.server.yml
index f59957e..0195656 100644
--- a/docker/compose/docker-compose.server.yml
+++ b/docker/compose/docker-compose.server.yml
@@ -31,9 +31,9 @@ services:
       - CLUEDIN_connectionStrings__GraphStore-Read=http://neo4j:@${CLUEDIN_NEO4J_HOST:-neo4j}:7474/db/data
       - CLUEDIN_connectionStrings__GraphStore-Write=http://neo4j:@${CLUEDIN_NEO4J_HOST:-neo4j}:7474/db/data
 
-      - CLUEDIN_connectionStrings__MessageBus=host=${CLUEDIN_RABBITMQ_HOST:-rabbitmq};username=guest;password=guest;product=CluedIn
+      - CLUEDIN_connectionStrings__MessageBus=host=${CLUEDIN_RABBITMQ_HOST:-rabbitmq};username=${CLUEDIN_RABBITMQ_USERNAME:-guest};password=${CLUEDIN_RABBITMQ_PASSWORD:-guest};product=CluedIn
       - CLUEDIN_connectionStrings__SearchStore=http://${CLUEDIN_ELASTIC_HOST:-elasticsearch}:9200
-      - CLUEDIN_connectionStrings__SignalRScaleOut=amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
+      - CLUEDIN_connectionStrings__SignalRScaleOut=amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672
 
       - CLUEDIN_connectionStrings__AuthenticationStore=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.Authentication;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
       - CLUEDIN_connectionStrings__AuditLog=Data Source=${CLUEDIN_SQLSERVER_HOST};Initial Catalog=DataStore.Db.AuditLog;User Id=${CLUEDIN_SQLSERVER_USER};Password=${CLUEDIN_SQLSERVER_PASS};MultipleActiveResultSets=True;connection timeout=0;Max Pool Size=200;Pooling=True
diff --git a/docker/compose/docker-compose.ui.yml b/docker/compose/docker-compose.ui.yml
index d45976d..650bc70 100644
--- a/docker/compose/docker-compose.ui.yml
+++ b/docker/compose/docker-compose.ui.yml
@@ -34,7 +34,7 @@ services:
         - "WEBHOOKS_URL=http://${CLUEDIN_SERVER_HOST:-server}:9006/"
         - "NODE_ENV=${CLUEDIN_ENVIRONMENT}"
         - "RabbitMQ_Notification_Channel=Notifications"
-        - "RabbitMQ_CS=amqp://guest:guest@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672"
+        - "RabbitMQ_CS=amqp://${CLUEDIN_RABBITMQ_USERNAME:-guest}:${CLUEDIN_RABBITMQ_PASSWORD:-guest}@${CLUEDIN_RABBITMQ_HOST:-rabbitmq}:5672"
         - "DbHost=${CLUEDIN_SQLSERVER_HOST}"
         - "DbPassword=${CLUEDIN_SQLSERVER_PASS}"
         - "DbUserName=${CLUEDIN_SQLSERVER_USER}"
diff --git a/docker/compose/docker-compose.yml b/docker/compose/docker-compose.yml
index d4c25d3..988c04e 100644
--- a/docker/compose/docker-compose.yml
+++ b/docker/compose/docker-compose.yml
@@ -20,6 +20,9 @@ services:
         ports:
             - "${CLUEDIN_RABBITMQ_DATA_LOCALPORT:-5672}:5672"
             - "${CLUEDIN_RABBITMQ_HTTP_LOCALPORT:-15672}:15672"
+        environment:
+            - RABBITMQ_DEFAULT_USER=${CLUEDIN_RABBITMQ_USERNAME:-guest}
+            - RABBITMQ_DEFAULT_PASS=${CLUEDIN_RABBITMQ_PASSWORD:-guest}
         hostname: cluedin-dev
     redis:
         image: redis:5.0-alpine
diff --git a/env/default/.env b/env/default/.env
index 07d80e7..3cfa848 100644
--- a/env/default/.env
+++ b/env/default/.env
@@ -17,7 +17,7 @@ CLUEDIN_DATASOURCE_HOST=
 CLUEDIN_DATASOURCE_LOCALPORT=
 CLUEDIN_DATASOURCE_PORT=
 CLUEDIN_DATASOURCE_TAG=latest
-CLUEDIN_DOMAIN=127.0.0.1.xip.io
+CLUEDIN_DOMAIN=127.0.0.1.nip.io
 CLUEDIN_ELASTIC_DATA_LOCALPORT=
 CLUEDIN_ELASTIC_HOST=
 CLUEDIN_ELASTIC_HTTP_LOCALPORT=
@@ -43,6 +43,8 @@ CLUEDIN_OPENREFINE_TAG=latest
 CLUEDIN_RABBITMQ_DATA_LOCALPORT=
 CLUEDIN_RABBITMQ_HOST=
 CLUEDIN_RABBITMQ_HTTP_LOCALPORT=
+CLUEDIN_RABBITMQ_USERNAME=
+CLUEDIN_RABBITMQ_PASSWORD=
 CLUEDIN_REDIS_HOST=
 CLUEDIN_REDIS_LOCALPORT=
 CLUEDIN_SEQ_DATA_LOCALPORT=
@@ -64,8 +66,6 @@ CLUEDIN_SUBMITTER_HOST=
 CLUEDIN_SUBMITTER_LOCALPORT=
 CLUEDIN_SUBMITTER_PORT=
 CLUEDIN_SUBMITTER_TAG=latest
-CLUEDIN_UI_LOCALPORT=9080
-CLUEDIN_UI_TAG=latest
 CLUEDIN_UI_ALT_UPLOAD=
 CLUEDIN_UI_FEATURES_ANNOTATION=annotation
 CLUEDIN_UI_FEATURES_CLEAN=
@@ -87,6 +87,8 @@ CLUEDIN_UI_FEATURES_SAVEDSEARCHES=
 CLUEDIN_UI_FEATURES_SETTINGS=settings
 CLUEDIN_UI_FEATURES_STREAMS=streams;stream
 CLUEDIN_UI_FEATURES_USERS=users
+CLUEDIN_UI_LOCALPORT=9080
+CLUEDIN_UI_TAG=latest
 CLUEDIN_WEBAPI_HOST=
 CLUEDIN_WEBAPI_LOCALPORT=
 CLUEDIN_WEBAPI_TAG=latest
diff --git a/powershell/bootstrap.ps1 b/powershell/bootstrap.ps1
index 6bceaf9..eb87c7e 100644
--- a/powershell/bootstrap.ps1
+++ b/powershell/bootstrap.ps1
@@ -13,7 +13,7 @@ function Invoke-Open {
     }
 
     $port  = $envDetails.CLUEDIN_UI_LOCALPORT ?? '9080'
-    $domain = $envDetails.CLUEDIN_DOMAIN ?? '127.0.0.1.xip.io'
+    $domain = $envDetails.CLUEDIN_DOMAIN ?? '127.0.0.1.nip.io'
     $address = "http://${Org}.${domain}:${port}"
     Start-Process $address
 }
diff --git a/powershell/docker.ps1 b/powershell/docker.ps1
index cfbd7fc..177d84a 100644
--- a/powershell/docker.ps1
+++ b/powershell/docker.ps1
@@ -12,7 +12,7 @@ function DockerCompose {
         [String[]]$Disable = @()
     )
 
-    $envPath = $Env | FindEnvironment | ForEach-Object { "--project-directory $($_.FullName)" }
+    $envPath = $Env | FindEnvironment | ForEach-Object { "--project-directory '$($_.FullName)'" }
     if(-not $envPath) {
         Write-Host "Could not find environment ${Env}"
         return
@@ -21,7 +21,7 @@ function DockerCompose {
     $composeRoot = [IO.Path]::Combine($PSScriptRoot, '..', 'docker', 'compose')
 
     $projectName = "-p cluedin_$($Env.ToLowerInvariant())"
-    $composeFiles = Get-ChildItem $composeRoot -Filter 'docker-compose*.yml' | ForEach-Object { "-f $($_.FullName)" }
+    $composeFiles = Get-ChildItem $composeRoot -Filter 'docker-compose*.yml' | ForEach-Object { "-f '$($_.FullName)'" }
 
     $compose = "docker-compose $projectName $composeFiles $envPath $action"
 
diff --git a/powershell/packages.ps1 b/powershell/packages.ps1
index 73ec34f..8fd2ad2 100644
--- a/powershell/packages.ps1
+++ b/powershell/packages.ps1
@@ -182,7 +182,7 @@ function Invoke-Packages {
         }
         'restore' {
             $envFile = Join-Path $envPath '.env'
-            $runCmd = "docker run --rm -a stdout -a stderr -v '${components}:/components' -v '${packages}:/packages' --env-file $envFile $image"
+            $runCmd = "docker run --rm -a stdout -a stderr -v '${components}:/components' -v '${packages}:/packages' --env-file '$envFile' $image"
             Write-Verbose "[docker]: $runCmd"
             Invoke-Expression $runCmd
         }