diff --git a/.gitignore b/.gitignore
index cdc34f7..e628bce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,10 @@ volumes/html/*
 
 # But not these directories
 !volumes/html/dl.zinomedia.de
-!volumes/html/joplin.zinomedia.de
 !volumes/logs/
 
 # Ignore contents of these directories
 volumes/html/dl.zinomedia.de/*
-volumes/html/joplin.zinomedia.de/*
 volumes/logs/*
 
 # Do not ignore a special file name
diff --git a/volumes/conf.d/joplin.zinomedia.de.conf.bak b/volumes/conf.d/joplin.zinomedia.de.conf
similarity index 65%
rename from volumes/conf.d/joplin.zinomedia.de.conf.bak
rename to volumes/conf.d/joplin.zinomedia.de.conf
index 62a4bfa..6a4b4ed 100644
--- a/volumes/conf.d/joplin.zinomedia.de.conf.bak
+++ b/volumes/conf.d/joplin.zinomedia.de.conf
@@ -3,8 +3,6 @@ server {
     listen [::]:443 ssl;
     server_name joplin.zinomedia.de;
 
-    root /usr/share/nginx/html/joplin.zinomedia.de;
-
     access_log off;
     error_log /var/log/nginx/error.log error;
 
@@ -18,18 +16,23 @@ server {
 
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
+    # Gzip Compression
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
-    # WebDAV Configuration
-    auth_basic "realm_name";
-    auth_basic_user_file /usr/share/nginx/html/joplin.zinomedia.de/.credentials.list;
-    dav_methods PUT DELETE MKCOL COPY MOVE;
-    dav_ext_methods PROPFIND OPTIONS;
-    dav_access user:rw group:rw all:r;
-    client_max_body_size 0;
-    create_full_put_path on;
-    autoindex on;
+    location / {
+        resolver 127.0.0.11;
+        set $upstream "joplin:22300";
+
+        proxy_pass http://$upstream;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Accept-Encoding gzip;
+        proxy_headers_hash_max_size 512;
+        proxy_headers_hash_bucket_size 128;
+        proxy_read_timeout 3600;
+    }
 }
 
 server {
diff --git a/volumes/html/joplin.zinomedia.de/.gitkeep b/volumes/html/joplin.zinomedia.de/.gitkeep
deleted file mode 100644
index e69de29..0000000