diff --git a/routing/docker-compose.yml b/routing/docker-compose.yml
index a9dea94..ef2f80f 100644
--- a/routing/docker-compose.yml
+++ b/routing/docker-compose.yml
@@ -66,7 +66,7 @@ services:
 
     authelia_db:
         image: postgres
-        name: authelia_db
+        container_name: authelia_db
         restart: unless_stopped
         environment:
             - POSTGRES_USER=authelia
@@ -99,7 +99,8 @@ services:
         restart: unless-stopped
         environment:
             - 'YOURLS_DB_HOST=yourls_db:3306'
-            - 'YOURLS_DB_PASS=${YOURLS_DB_PASS}'
+            - 'YOURLS_DB_USER=yourls'
+            - 'YOURLS_DB_PASS=yourls'
             - 'YOURLS_SITE=${YOURLS_URL}'
             - 'YOURLS_USER=${YOURLS_USER}'
             - 'YOURLS_PASS=${YOURLS_PASS}'
@@ -116,7 +117,9 @@ services:
         volumes:
             - '/home/nick/configs/routing/yourls:/var/lib/mysql'
         environment:
-            - 'MYSQL_ROOT_PASSWORD=${YOURLS_DB_PASS}'
+            - 'MYSQL_USER=yourls'
+            - 'MYSQL_PASSWORD=yourls'
+            - 'MYSQL_DATABASE=yourls'
         networks:
             - yourls
         user: '1000:1000'