diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7eb30d0..fb46ce3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,15 +1,16 @@
 services:
   x-common-variables: &common-variables
-    ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088'"
   joplin:
     image: joplin/server:latest
     container_name: joplin-server
     restart: always
     environment:
-      - APP_PORT=8030
-      - APP_BASE_URL=https://server.joplin.adamoutler.com
-      - DB_CLIENT=sqlite3
-      - DB_FILE=/var/lib/joplin/database.sqlite
+      APP_PORT: 8030
+      APP_BASE_URL: https://server.joplin.adamoutler.com
+      DB_CLIENT: sqlite3
+      DB_FILE: /var/lib/joplin/database.sqlite
+      ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088'"
+
     ports:
       - "8030:8030"
     volumes:
@@ -21,7 +22,8 @@ services:
     depends_on:
       - joplin-terminal-xapi
     environment:
-       <<: *common-variables
+      ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088'"
+
     restart: unless-stopped
     ports:
       - 8088:8000