diff --git a/docker-compose.yaml b/docker-compose.yaml
index d07c44f..10729e4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,3 @@
-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, https://joplin.github.io"
 
 services:
   joplin-server:
@@ -48,8 +47,6 @@ services:
       MAILER_AUTH_PASSWORD: ${GMAIL_APP_PASSWORD}
       MAILER_NOREPLY_NAME: JoplinServer
       MAILER_NOREPLY_EMAIL: ${GMAIL_EMAIL}
-      ORIGINS: "https://joplin.adamoutler.com" 
-
     ports:
       - "8030:8030"
     volumes:
@@ -73,41 +70,17 @@ services:
     networks:
       - joplin-net
 
-
-  joplin-vieweb:
-    image: gri38/django-joplin-vieweb:latest
-    container_name: joplin-vieweb
-    depends_on:
-      - joplin-terminal-xapi
-    environment:
-      ORIGINS: *origins
-      CERT_DOMAIN: joplin.adamoutler.com
-      TZ: America/New York
-    restart: unless-stopped
+  joplin-webapp:
+    container_name: joplin-webapp
+    image: ghcr.io/adamoutler/web-app:latest
     ports:
-      - 8088:8000
-      - 8089:8001
-    volumes:
-      - apidata:/root/.config/joplin:ro
-      - 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
-    volumes:
-      - apidata:/root/.config/joplin
+      - "7880:80"
     networks:
       - joplin-net
 
 
 volumes:
   data:
-  vieweb:
-  apidata:
   database: