diff --git a/README.md b/README.md
index ad95e09..e18093d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ When everything's ready start Traccar with Docker Compose, otherwise head down t
 export COMPOSE_DIR='/opt/containers/traccar'
 export COMPOSE_CTX='ux_vilnius'
 export COMPOSE_PROJECT='traccar-'"${COMPOSE_CTX}"
-export COMPOSE_FILE="${COMPOSE_DIR}"'/docker-compose.yml'
+export COMPOSE_FILE="${COMPOSE_DIR}"'/docker-compose.yaml'
 export COMPOSE_ENV=<add accordingly>
 ```
 
@@ -29,7 +29,7 @@ docker context create fully.qualified.domain.name --docker 'host=ssh://root@full
 Pull both Traccar and MySQL:
 
 ```
-docker compose --project-name "${COMPOSE_PROJECT}" --file "${COMPOSE_FILE}" --env-file "${COMPOSE_ENV}" --profile 'full' pull
+docker  --project-name "${COMPOSE_PROJECT}" --file "${COMPOSE_FILE}" --env-file "${COMPOSE_ENV}" --profile 'full' pull
 ```
 
 ## Copy to target
diff --git a/common-settings.yml b/common-settings.yaml
similarity index 83%
rename from common-settings.yml
rename to common-settings.yaml
index 9fd26d7..19d917f 100644
--- a/common-settings.yml
+++ b/common-settings.yaml
@@ -8,4 +8,4 @@ services:
                 max-size: "10m"
                 max-file: "10"
                 compress: "true"
-        restart: "${RESTARTPOLICY:-unless-stopped}"
+        restart: "${RESTARTPOLICY:-always}"
diff --git a/docker-compose.yml b/compose.yaml
similarity index 90%
rename from docker-compose.yml
rename to compose.yaml
index 8c78752..add0453 100644
--- a/docker-compose.yml
+++ b/compose.yaml
@@ -11,7 +11,7 @@ services:
                 soft: ${ULIMIT_NPROC-65535}
                 hard: ${ULIMIT_NPROC-65535}
         extends:
-            file: common-settings.yml
+            file: common-settings.yaml
             service: common-settings
         ports:
             - "${TRACCAR_WEBUI_PORT}:8082"
@@ -35,15 +35,14 @@ services:
                 soft: ${ULIMIT_NPROC-65535}
                 hard: ${ULIMIT_NPROC-65535}
         extends:
-            file: common-settings.yml
+            file: common-settings.yaml
             service: common-settings
         ports:
             - "${MYSQL_PORT}:3306"
         volumes:
             - /opt/docker-data/traccar-${CONTEXT}/mysql/config/db:/etc/mysql/conf.d
             - /opt/docker-data/traccar-${CONTEXT}/mysql/config/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-            - /opt/docker-data/traccar-${CONTEXT}/mysql/data/datadir:/var/lib/mysql
-            - /opt/docker-data/traccar-${CONTEXT}/mysql/data/tmpdir:/tmp/mysql
+            - /opt/docker-data/traccar-${CONTEXT}/mysql/data:/var/lib/mysql
         environment:
             MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
             MYSQL_DATABASE: ${MYSQL_DATABASE}
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
deleted file mode 100644
index 8ea48d3..0000000
--- a/docker-compose.override.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-services:
-    traccar-build:
-        image: "traccar/traccar:${TRACCAR_VERSION}"
-        profiles: ["build", "build-traccar"]
-        build:
-            context: "build-context/traccar"
-            dockerfile: Dockerfile
-            args:
-                TRACCAR_VERSION: "${TRACCAR_VERSION}"
-    mysql-build:
-        image: "mysql:${MYSQL_VERSION}"
-        profiles: ["build", "build-mysql"]
-        build:
-            context: "build-context/mysql"
-            dockerfile: Dockerfile
-            args:
-                MYSQL_VERSION: "${MYSQL_VERSION}"