diff --git a/data/nginx/app.conf b/data/nginx/app.conf
index 4b8f612..b26294d 100644
--- a/data/nginx/app.conf
+++ b/data/nginx/app.conf
@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name api.uat.retropilot.org;
+    server_name uat.api.retropilot.org;
     location /.well-known/acme-challenge/ {
         root /var/www/certbot;
     }
@@ -10,7 +10,7 @@ server {
 }
 server {
     listen 443 ssl;
-    server_name api.uat.retropilot.org;
+    server_name uat.api.retropilot.org;
 
     location / {
         proxy_set_header Host $host;
@@ -21,8 +21,8 @@ server {
         proxy_pass http://server:8080;
     }
 
-    ssl_certificate /etc/letsencrypt/live/api.uat.retropilot.org/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/api.uat.retropilot.org/privkey.pem;
+    ssl_certificate /etc/letsencrypt/live/uat.api.retropilot.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/uat.api.retropilot.org/privkey.pem;
 
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
diff --git a/environment/uat/.env.sample b/environment/uat/.env.sample
index 155081d..784c944 100644
--- a/environment/uat/.env.sample
+++ b/environment/uat/.env.sample
@@ -27,17 +27,17 @@ SMTP_PASS=
 SMTP_FROM="no-reply@retropilot.org"
 
 # base url of the retropilot server
-BASE_URL="https://api.uat.retropilot.org/"
+BASE_URL="https://uat.api.retropilot.org/"
 # base url sent to devices for POSTing drives & logs
-BASE_UPLOAD_URL="https://api.uat.retropilot.org/backend/post_upload"
+BASE_UPLOAD_URL="https://uat.api.retropilot.org/backend/post_upload"
 # base download url for drive & log data
-BASE_DRIVE_DOWNLOAD_URL="https://api.uat.retropilot.org/realdata/"
+BASE_DRIVE_DOWNLOAD_URL="https://uat.api.retropilot.org/realdata/"
 # path mapping of above download url for expressjs, prefix with "/"
 BASE_DRIVE_DOWNLOAD_PATH_MAPPING="/realdata"
 # relative or absolute ( "/..." for absolute path )
 STORAGE_PATH="/realdata/"
 
-CABANA_URL="https://api.uat.retropilot.org/cabana/index.html"
+CABANA_URL="https://uat.api.retropilot.org/cabana/index.html"
 
 DEVICE_STORAGE_QUOTA_MB=200000
 DEVICE_EXPIRATION_DAYS=30
diff --git a/environment/uat/README.md b/environment/uat/README.md
index 4da8cae..b6ae12f 100644
--- a/environment/uat/README.md
+++ b/environment/uat/README.md
@@ -1,6 +1,6 @@
 # User Acceptance Testing (UAT) environment
 
-Hostname: `api.uat.retropilot.org`
+Hostname: `uat.api.retropilot.org`
 
 ## Setup
 
diff --git a/environment/uat/docker-compose.yml b/environment/uat/docker-compose.yml
index 22df4a7..5f3f857 100644
--- a/environment/uat/docker-compose.yml
+++ b/environment/uat/docker-compose.yml
@@ -50,8 +50,8 @@ services:
       - "traefik.enable=true"
       # API service forwards requests to container port 8080
       - "traefik.http.services.api.loadbalancer.server.port=8080"
-      # Expose api at https://api.uat.retropilot.org and https://uat.api.retropilot.org
-      - "traefik.http.routers.api.rule=Host(`api.uat.retropilot.org`) || Host(`uat.api.retropilot.org`)"
+      # Expose api at https://uat.api.retropilot.org
+      - "traefik.http.routers.api.rule=Host(`uat.api.retropilot.org`) || Host(`uat.api.retropilot.org`)"
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.service=api@docker"
       - "traefik.http.routers.api.tls=true"
diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh
index de90803..6bac7a0 100755
--- a/init-letsencrypt.sh
+++ b/init-letsencrypt.sh
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v docker-compose)" ]; then
   exit 1
 fi
 
-domains=(api.uat.retropilot.org)
+domains=(uat.api.retropilot.org)
 rsa_key_size=4096
 data_path="./data/certbot"
 email="" # Adding a valid address is strongly recommended
diff --git a/static/patches/retropilot-uat-api.patch b/static/patches/retropilot-uat-api.patch
index f45cd13..acaa0d0 100644
--- a/static/patches/retropilot-uat-api.patch
+++ b/static/patches/retropilot-uat-api.patch
@@ -6,6 +6,6 @@ index 1525e1715..a58067926 100755
  #!/usr/bin/bash
 
  export PASSIVE="0"
-+export API_HOST="https://api.uat.retropilot.org"
++export API_HOST="https://uat.api.retropilot.org"
  exec ./launch_chffrplus.sh