diff --git a/docker-host/setup/tasks/file-server.yml b/docker-host/setup/tasks/file-server.yml
index bd836b7..a18afbc 100644
--- a/docker-host/setup/tasks/file-server.yml
+++ b/docker-host/setup/tasks/file-server.yml
@@ -8,21 +8,21 @@
       include_vars:
         dir: ../vars
 
-    - name: Include FQDN
-      include_vars:
-        dir: ../defaults
+    - name: Ensure Filebrowser Volume Exists
+      community.docker.docker_volume:
+        name: file-storage
+        state: present
 
     - name: Setup Filebrowser Container
       community.docker.docker_container:
-        name: filestash
+        name: filebrowser
         image: filebrowser/filebrowser
         restart_policy: always
         recreate: yes
-        user: "{{FILES_UID}}:{{FILES_GID}}"
         volumes:
-          - "{{FILES_HOME}}:/srv"
+          - "file-storage:/srv"
         ports:
-          - "{{FILEBROWSER_PORT}}:{{FILEBROWSER_PORT}}"
+          - "{{FILEBROWSER_PORT}}:80"