diff --git a/docker-compose.yaml b/docker-compose.yaml
index b4c7423..c2dce27 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,9 +1,12 @@
+x-origins: &origins "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088','http://192.168.1.115:8089','https://adamoutler.github.io/'"
+
 services:
   joplin-server:
     image: joplin/server:latest
     container_name: joplin-server
     restart: always
     environment:
+      TZ: America/New York
       APP_PORT: 8030
       APP_BASE_URL: https://server.joplin.adamoutler.com
       DB_CLIENT: sqlite3
@@ -16,21 +19,22 @@ services:
       MAILER_AUTH_PASSWORD: ${GOOGLE_APP_PASSWORD}
       MAILER_NOREPLY_NAME: JoplinServer
       MAILER_NOREPLY_EMAIL: adamoutler@gmail.com
-      ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088','http://192.168.1.115:8089'"
-      TZ: America/New York
+      ORIGINS: *origins
     ports:
       - "8030:8030"
     volumes:
       - data:/var/lib/joplin
     networks:
       - joplin-net
+
+
   joplin-vieweb:
     image: gri38/django-joplin-vieweb:latest
     container_name: joplin-vieweb
     depends_on:
       - joplin-terminal-xapi
     environment:
-      ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088','http://192.168.1.115:8089'"
+      ORIGINS: *origins
       CERT_DOMAIN: joplin.adamoutler.com
       TZ: America/New York
     restart: unless-stopped
@@ -42,23 +46,28 @@ services:
       - vieweb:/root/.config/joplin-vieweb
     networks:
       - joplin-net
+
+
   joplin-terminal-xapi:
     container_name: joplin-terminal-xapi
     image: gri38/joplin-terminal-xapi:latest
     restart: unless-stopped
     environment:
       CERT_DOMAIN: joplin.adamoutler.com
-      ORIGINS: "'https://joplin.adamoutler.com','https://server.joplin.adamoutler.com', 'http://192.168.1.115:8083','http://192.168.1.115:8088','http://192.168.1.115:8089'"
+      ORIGINS: *origins
       TZ: America/New York
     volumes:
       - apidata:/root/.config/joplin
     networks:
       - joplin-net
+
+
 volumes:
   data:
   vieweb:
   apidata:
 
+
 networks:
   joplin-net:
     name: joplin-net
\ No newline at end of file