diff --git a/docker-compose.yml b/docker-compose.yml
index bd6c60b..03ff345 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,29 +5,23 @@ services:
         container_name: traccar_db
         command: --default-authentication-plugin=mysql_native_password
         restart: always
-        env_file: .env
-        environment:
-            - PUID=1002
-            - PGID=1002
-        
+        env_file: .env        
         volumes:
             - /etc/localtime:/etc/localtime:ro
-#            - db-datavolume:/var/lib/mysql
             - ./data:/var/lib/mysql
             - ./mysql:/etc/mysql/conf.d
-#        ports:
-#            - "3306:3306"
         networks:
          traccar_backend:
 
     traccar:
-        image: traccar/traccar:4.8-alpine
+        image: traccar/traccar:latest
         container_name: traccar
         depends_on:
             - traccar_db
         restart: always
         volumes:
-            - ./traccar/conf/traccar.xml:/opt/traccar/conf/traccar.xml:ro
+            - ./traccar.xml:/opt/traccar/conf/traccar.xml:ro
+            - ./docker/traccar/data:/opt/traccar/data:rw
             - ./var/log/traccar:/opt/traccar/logs:rw
             - ./traccar/web/favicon.ico:/opt/traccar/web/favicon.ico:ro
             - ./traccar/web/icon.png:/opt/traccar/web/icon.png:ro
@@ -35,27 +29,23 @@ services:
             - ./traccar/web/release.html:/opt/traccar/web/release.html:ro
             - ./traccar/web/app.css:/opt/traccar/web/app.css:ro
         environment:
-          - PUID=1002
-          - PGID=1002
-          - VIRTUAL_HOST=track.airdog.site
-          - LETSENCRYPT_HOST=track.airdog.site
+          - VIRTUAL_HOST=track.franv.site
+          - LETSENCRYPT_HOST=track.franv.site
           - LETSENCRYPT_EMAIL=ouch@thetrauma.org
           - VIRTUAL_PORT=8082
           - TRUSTED_PROXY=nginx-proxy
         
         ports:
             - "5055:5055"
-            - "8082:8082"
+#            - "8082:8082"
 
         volumes:
-          - /var/run/docker.sock:/var/run/docker.sock
+          - /run/user/1000/docker.sock:/var/run/docker.sock
         networks:
-          franvproxy_test_proxy-tier:
+          acme-companion_proxy-tier:
           traccar_backend:
           
-#volumes:
-#    db-datavolume:
 networks:
   traccar_backend:
-  franvproxy_test_proxy-tier:
+  acme-companion_proxy-tier:
     external: true