diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index e0a75d9..76f0302 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -52,11 +52,9 @@ jobs:
           echo "DOCKERHUB_IMAGE_TAGS=$_DOCKERHUB_IMAGE_TAGS" >> $GITHUB_ENV
       - name: Set environment DOCKERHUB_IMAGE_PLATFORMS
         run: |
-          _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64"
-          if [ "${{ matrix.os }}" == "debian" ]; then
-            _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm64"
-          elif [ "${{ matrix.os }}" == "ubuntu" ]; then
-            _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7,linux/arm64"
+          _DOCKERHUB_IMAGE_PLATFORMS="linux/amd64,linux/arm64"
+          if [ "${{ matrix.os }}" == "ubuntu" ]; then
+            _DOCKERHUB_IMAGE_PLATFORMS+=",linux/arm/v7"
           fi
           echo "DOCKERHUB_IMAGE_PLATFORMS=$_DOCKERHUB_IMAGE_PLATFORMS" >> $GITHUB_ENV
       - name: Build and push
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 7a551a4..eeb5319 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,6 +1,6 @@
-FROM alpine:3.18
+FROM alpine:3.19.1
 
-ENV TRACCAR_VERSION 5.12
+ENV TRACCAR_VERSION 6.1
 
 WORKDIR /opt/traccar
 
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 5311837..aeca6a0 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,6 +1,6 @@
 FROM openjdk:11-jre-slim-bullseye
 
-ENV TRACCAR_VERSION 5.12
+ENV TRACCAR_VERSION 6.1
 
 WORKDIR /opt/traccar
 
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 0983a8b..8964b5d 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,6 +1,6 @@
 FROM adoptopenjdk:11-jre-hotspot-focal
 
-ENV TRACCAR_VERSION 5.12
+ENV TRACCAR_VERSION 6.1
 
 WORKDIR /opt/traccar
 
diff --git a/README.md b/README.md
index 75b2d27..fd507ca 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,16 @@ DockerHub image: <https://hub.docker.com/r/traccar/traccar> ![](https://img.shie
 Maintainer: [Maxim Zalysin](https://github.com/magna-z)
 
 ## Available tags:
+#### 6.X
+- **6.1-alpine**, **6-alpine**, **alpine**, **6.1**, **6**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.1-alpine)
+- **6.1-debian**, **6-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.1-debian)
+- **6.1-ubuntu**, **6-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/6.1-ubuntu)
+- _..._
+- _**6.0**, **6.0-alpine** / **6.0-debian** / **6.0-ubuntu**_
 #### 5.X
-- **5.12-alpine**, **5-alpine**, **alpine**, **5.12**, **5**, **latest** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-alpine)
-- **5.12-debian**, **5-debian**, **debian** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-debian)
-- **5.12-ubuntu**, **5-ubuntu**, **ubuntu** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-ubuntu)
+- **5.12-alpine**, **5-alpine**, **5.12**, **5** ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-alpine)
+- **5.12-debian**, **5-debian**, ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-debian)
+- **5.12-ubuntu**, **5-ubuntu**, ![](https://img.shields.io/docker/image-size/traccar/traccar/5.12-ubuntu)
 - _..._
 - _**5.0**, **5.0-alpine** / **5.0-debian** / **5.0-ubuntu**_
 #### 4.X
@@ -23,9 +29,9 @@ Maintainer: [Maxim Zalysin](https://github.com/magna-z)
 - _**3.16**, **3.16-alpine** / **3.16-debian**_
 
 ## Available multi-platform images:
-**Alpine based**: linux/amd64  
+**Alpine based**: linux/amd64, linux/arm64  
 **Debian based**: linux/amd64, linux/arm64  
-**Ubuntu based**: linux/amd64, linux/arm/v7, linux/arm64
+**Ubuntu based**: linux/amd64, linux/arm64, linux/arm/v7
 
 ## Container create example:
 1. **Create work directories:**