diff --git a/docker-compose.yml b/docker-compose.yml
index 9d0a5d2..af21aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,8 @@ networks:
     name: nextcloud_network
   ha_network:
     name: ha_network
+  joplin_network:
+    name: joplin_network
 
 services:
 
@@ -59,14 +61,14 @@ services:
       - PGID=1000
       - TZ=Europe/London
       - JELLYFIN_PublishedServerUrl=${JELLYFIN_DOMAIN_NAME}
+      - DOCKER_MODS=linuxserver/mods:jellyfin-amd
     volumes:
       - ${DOCKER_CONFIG_DIR}/jellyfin/library:/config
       - /mnt/drive-one/media/series:/data/series
       - /mnt/drive-one/media/movies:/data/movies
       - /dev/shm/JellyfinTranscode:/transcode
     devices:
-      - /dev/dri/renderD128:/dev/dri/renderD128
-      - /dev/dri/card0:/dev/dri/card0
+      - /dev/dri/:/dev/dri/
     ports:
       - 8096:8096
 
@@ -154,6 +156,7 @@ services:
     networks:
       - nextcloud_network
 
+
 #
 # SELFHOSTED PHOTOS
 #
@@ -198,6 +201,42 @@ services:
     ports:
       - 2080:2342
 
+#
+# NOTE TAKING
+#
+  joplin_server:
+    image: joplin/server:latest
+    container_name: joplin_server
+    depends_on:
+      - joplin_db
+    restart: unless-stopped
+    environment:
+      - APP_PORT=22300
+      - APP_BASE_URL=https://joplin.spanskiduh.xyz
+      - DB_CLIENT=pg
+      - POSTGRES_PASSWORD=${JOPLIN_POSTGRES_PASSWORD}
+      - POSTGRES_DATABASE=${JOPLIN_POSTGRES_DATABASE}
+      - POSTGRES_USER=${JOPLIN_POSTGRES_USER}
+      - POSTGRES_PORT=${JOPLIN_POSTGRES_PORT}
+      - POSTGRES_HOST=joplin_db
+    ports:
+      - "22300:22300"
+    networks:
+      - joplin_network
+
+  joplin_db:
+    image: postgres:latest
+    container_name: joplin_db
+    restart: unless-stopped
+    environment:
+      - POSTGRES_PASSWORD=${JOPLIN_POSTGRES_PASSWORD}
+      - POSTGRES_USER=${JOPLIN_POSTGRES_USER}
+      - POSTGRES_DB=${JOPLIN_POSTGRES_DATABASE}
+    volumes:
+      - ${DOCKER_DATA_DIR}/postgres:/var/lib/postgresql/data
+    networks:
+      - joplin_network
+
 #
 # MQTT, IOT DATABASE AND HOMEASSISTANT
 #
@@ -212,7 +251,7 @@ services:
     volumes:
       - ${DOCKER_LOG_DIR}:/mosquitto/log
       - ${DOCKER_DATA_DIR}/mqtt:/mosquitto/data
-      - ${DOCKER_CONFIG_DIR}/mqtt:/mosquitto/config
+      - ${DOCKER_CONFIG_DIR}/mqtt:/osquitto/config
     networks:
       - ha_network