diff --git a/config.template/faf-user-service/faf-user-service.env b/config.template/faf-user-service/faf-user-service.env
index 48b81190..c3f416cb 100644
--- a/config.template/faf-user-service/faf-user-service.env
+++ b/config.template/faf-user-service/faf-user-service.env
@@ -1,11 +1,11 @@
-PASSWORD_RESET_URL=https://faforever.com/account/password/reset
-REGISTER_ACCOUNT_URL=https://faforever.com/account/register
+PASSWORD_RESET_URL=https://test.faforever.com/account/password/reset
+REGISTER_ACCOUNT_URL=https://test.faforever.com/account/register
 FAILED_LOGIN_ACCOUNT_THRESHOLD=5
 FAILED_LOGIN_ATTEMPT_THRESHOLD=10
 FAILED_LOGIN_THROTTLING_MINUTES=5
 FAILED_LOGIN_DAYS_TO_CHECK=1
-HYDRA_ISSUER=https://hydra.faforever.com/
+HYDRA_ISSUER=https://hydra.test.faforever.com/
 HYDRA_BASE_ADMIN_URL=http://faf-ory-hydra:4445
-DB_R2DBC_URL=r2dbc:pool:mysql://faf-db:3306/faf?ssl=false
+DB_R2DBC_URL=r2dbc:mariadb://faf-db:3306/faf?ssl=false
 DB_USERNAME=faf-user-service
 DB_PASSWORD=banana
diff --git a/docker-compose.yml b/docker-compose.yml
index baf1dae0..aca6f6bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -412,11 +412,7 @@ services:
   #
   faf-user-service:
     container_name: faf-user-service
-    image: faforever/faf-user-service:1.0.11
-    networks:
-      faf:
-        aliases:
-          - "faf-user-service"
+    image: faforever/faf-user-service:2.0.0
     restart: unless-stopped
     env_file: ./config/faf-user-service/faf-user-service.env
     labels: