diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bca9ea2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+data/database/filebrowser.db
diff --git a/data/branding/img/icons/android-chrome-192x192.png b/branding/img/icons/android-chrome-192x192.png
similarity index 100%
rename from data/branding/img/icons/android-chrome-192x192.png
rename to branding/img/icons/android-chrome-192x192.png
diff --git a/data/branding/img/icons/android-chrome-512x512.png b/branding/img/icons/android-chrome-512x512.png
similarity index 100%
rename from data/branding/img/icons/android-chrome-512x512.png
rename to branding/img/icons/android-chrome-512x512.png
diff --git a/data/branding/img/icons/apple-touch-icon.png b/branding/img/icons/apple-touch-icon.png
similarity index 100%
rename from data/branding/img/icons/apple-touch-icon.png
rename to branding/img/icons/apple-touch-icon.png
diff --git a/data/branding/img/icons/browserconfig.xml b/branding/img/icons/browserconfig.xml
similarity index 100%
rename from data/branding/img/icons/browserconfig.xml
rename to branding/img/icons/browserconfig.xml
diff --git a/data/branding/img/icons/favicon-16x16.png b/branding/img/icons/favicon-16x16.png
similarity index 100%
rename from data/branding/img/icons/favicon-16x16.png
rename to branding/img/icons/favicon-16x16.png
diff --git a/data/branding/img/icons/favicon-32x32.png b/branding/img/icons/favicon-32x32.png
similarity index 100%
rename from data/branding/img/icons/favicon-32x32.png
rename to branding/img/icons/favicon-32x32.png
diff --git a/data/branding/img/icons/favicon.ico b/branding/img/icons/favicon.ico
similarity index 100%
rename from data/branding/img/icons/favicon.ico
rename to branding/img/icons/favicon.ico
diff --git a/data/branding/img/icons/gafiled.png b/branding/img/icons/gafiled.png
similarity index 100%
rename from data/branding/img/icons/gafiled.png
rename to branding/img/icons/gafiled.png
diff --git a/data/branding/img/icons/mstile-150x150.png b/branding/img/icons/mstile-150x150.png
similarity index 100%
rename from data/branding/img/icons/mstile-150x150.png
rename to branding/img/icons/mstile-150x150.png
diff --git a/data/branding/img/icons/safari-pinned-tab.svg b/branding/img/icons/safari-pinned-tab.svg
similarity index 100%
rename from data/branding/img/icons/safari-pinned-tab.svg
rename to branding/img/icons/safari-pinned-tab.svg
diff --git a/data/branding/img/icons/site.webmanifest b/branding/img/icons/site.webmanifest
similarity index 100%
rename from data/branding/img/icons/site.webmanifest
rename to branding/img/icons/site.webmanifest
diff --git a/data/branding/img/logo.svg b/branding/img/logo.svg
similarity index 100%
rename from data/branding/img/logo.svg
rename to branding/img/logo.svg
diff --git a/data/branding/logo.svg b/branding/logo.svg
similarity index 100%
rename from data/branding/logo.svg
rename to branding/logo.svg
diff --git a/data/settings.json b/data/config/settings.json
similarity index 69%
rename from data/settings.json
rename to data/config/settings.json
index 3ccf12d..4760c9e 100644
--- a/data/settings.json
+++ b/data/config/settings.json
@@ -3,6 +3,6 @@
     "baseURL": "",
     "address": "",
     "log": "stdout",
-    "database": "/database.db",
+    "database": "/database/filebrowser.db",
     "root": "/srv"
 }
diff --git a/data/filebrowser.db b/data/filebrowser.db
deleted file mode 100644
index ea42781..0000000
Binary files a/data/filebrowser.db and /dev/null differ
diff --git a/docker-compose.yml b/docker-compose.yml
index fd8d434..88805bf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,16 +2,13 @@
 services:
   file-browser:
     restart: always
-    image: filebrowser/filebrowser:latest
+    image: filebrowser/filebrowser
     container_name: filebrowser
-    user: 1000:1000
     ports:
       - 8040:80
     volumes:
-      - /media/share:/srv
-      - ./data/filebrowser.db:/database.db
-      - ./data/settings.json:/.filebrowser.json
-      - ./data/gafiled.png:/config/logo.png
-      - ./data/branding:/branding
-    security_opt:
-      - no-new-privileges:true
+      - /nas/share:/srv
+      - ./data/database:/database
+      - ./data/config:/config
+      - ./branding:/branding:ro
+