diff --git a/public/svgs/traccar.png b/public/svgs/traccar.png
new file mode 100644
index 000000000..c747aea05
Binary files /dev/null and b/public/svgs/traccar.png differ
diff --git a/templates/compose/traccar.yml b/templates/compose/traccar.yaml
similarity index 63%
rename from templates/compose/traccar.yml
rename to templates/compose/traccar.yaml
index 00ba1b699..5aa0887fe 100644
--- a/templates/compose/traccar.yml
+++ b/templates/compose/traccar.yaml
@@ -1,18 +1,18 @@
 # documentation: https://www.traccar.org/documentation/
 # slogan: Traccar is a free and open source modern GPS tracking system.
 # tags: traccar,gps,tracking,open,source
-# logo: 
+# logo: svgs/traccar.png
 # port: 8082
 
 services:
   traccar:
-    image: traccar/traccar
+    image: traccar/traccar:latest
     environment:
       - SERVICE_FQDN_TRACCAR_8082
-      - SERVICE_FQDN_TRACCAR_API_5159
-      - CONFIG_USE_ENVIRONMENT_VARIABLES=true
-      - DATABASE_USER=$SERVICE_USER_POSTGRES
-      - DATABASE_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - SERVICE_FQDN_TRACCARAPI_5159
+      - CONFIG_USE_ENVIRONMENT_VARIABLES=${CONFIG_USE_ENVIRONMENT_VARIABLES:-true}
+      - DATABASE_USER=${SERVICE_USER_POSTGRES}
+      - DATABASE_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
     volumes:
       - type: bind
         source: ./srv/traccar/conf/traccar.xml
@@ -28,14 +28,21 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8082/ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 15s
+
   postgres:
     image: postgres:16-alpine
     environment:
       - POSTGRES_USER=$SERVICE_USER_POSTGRES
-      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - POSTGRES_DB=traccar
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - POSTGRES_DB=${POSTGRESQL_DATABASE:-traccar}
     volumes:
-      - traccar-db-data:/var/lib/postgresql/data/
+      - traccar-postgresql-data:/var/lib/postgresql/data/
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
       interval: 5s