diff --git a/README.md b/README.md
index d3f0057..34945cd 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,24 @@ The athena websockets interface is not implemented yet, so the comma app and ath
 
 ## UAT
 
+Note that the first time you run the PostgreSQL container it will have to initialise.
+The server and worker cannot interact with it before this happens.
+
+Before first run:
+```
+cd environment/uat
+
+# Create the database
+docker-compose up db
+# CTRL-C when "database system is ready to accept connections" message appears
+
+# Allow the API program to initialise the database schema
+docker-compose up db api
+# CTRL-C when "RetroPilot Server listening at" message appears
+```
+
 Launch with:
 ```
-(cd environment/uat && docker-compose up -d)
+cd environment/uat
+docker-compose up -d
 ```
diff --git a/environment/uat/docker-compose.yml b/environment/uat/docker-compose.yml
index eae817d..d83d3ea 100644
--- a/environment/uat/docker-compose.yml
+++ b/environment/uat/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 #      - "traefik.http.routers.dashboard.entrypoints=websecure"
 #      - "traefik.http.routers.dashboard.service=api@internal"
 #      - "traefik.http.routers.dashboard.tls=true"
-#      - "traefik.http.routers.dashboard.tls.certresolver=myresolver"
+#      - "traefik.http.routers.dashboard.tls.certresolver=retropilot"
 #      # Secure the dashboard with BasicAuth middleware
 #      - "traefik.http.routers.dashboard.middlewares=dashboard-auth@docker"
 #      # BasicAuth: username=admin, password=password
@@ -59,7 +59,7 @@ services:
       - "traefik.http.routers.api.entrypoints=websecure"
       - "traefik.http.routers.api.service=api@docker"
       - "traefik.http.routers.api.tls=true"
-      - "traefik.http.routers.api.tls.certresolver=myresolver"
+      - "traefik.http.routers.api.tls.certresolver=retropilot"
 #      # Athena service forwards requests to container port 4040
 #      - "traefik.http.services.athena.loadbalancer.server.port=4040"
 #      # Expose athena at https://uat.athena.retropilot.org
@@ -67,7 +67,7 @@ services:
 #      - "traefik.http.routers.athena.entrypoints=websecure"
 #      - "traefik.http.routers.athena.service=athena@docker"
 #      - "traefik.http.routers.athena.tls=true"
-#      - "traefik.http.routers.athena.tls.certresolver=myresolver"
+#      - "traefik.http.routers.athena.tls.certresolver=retropilot"
 
   # API worker
   worker:
diff --git a/environment/uat/traefik/acme/acme.json b/environment/uat/traefik/acme/acme.json
new file mode 100644
index 0000000..e69de29
diff --git a/environment/uat/traefik/traefik.toml b/environment/uat/traefik/traefik.toml
index 351ddc7..7d14cf0 100644
--- a/environment/uat/traefik/traefik.toml
+++ b/environment/uat/traefik/traefik.toml
@@ -23,10 +23,10 @@
     address = ":443"
 
 [certificatesResolvers]
-  [certificatesResolvers.myresolver]
-    [certificatesResolvers.myresolver.acme]
+  [certificatesResolvers.retropilot]
+    [certificatesResolvers.retropilot.acme]
       caServer = "https://acme-v02.api.letsencrypt.org/directory"
       email = "admin@retropilot.org"
       storage = "acme.json"
-      [certificatesResolvers.myresolver.acme.httpChallenge]
+      [certificatesResolvers.retropilot.acme.httpChallenge]
         entryPoint = "web"