diff --git a/.github/workflows/callable-build-docker-image.yml b/.github/workflows/callable-build-docker-image.yml
index 50955e6..e68dd38 100644
--- a/.github/workflows/callable-build-docker-image.yml
+++ b/.github/workflows/callable-build-docker-image.yml
@@ -44,7 +44,7 @@ jobs:
           password: ${{ secrets.GH_TOKEN }}
 
       - name: Build image and push to registry - ${{ inputs.DOCKER_REGISTRY_IMAGE }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           context: .
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d9527d5..5a208cc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,9 +2,9 @@
 # Author: Alexander Tebiev - https://github.com/beeyev/phpmyadmin-docker-lightweight
 # docker buildx build --build-arg=BASE_IMAGE_VERSION=5.2-fpm-alpine --cache-to=type=inline --pull --tag phpmyadmin-fpm-alpine-caddy --file ./docker/Dockerfile ./ && docker run -p 9090:80 -it --rm phpmyadmin-fpm-alpine-caddy
 ARG BASE_IMAGE_VERSION
-FROM phpmyadmin:${BASE_IMAGE_VERSION} as phpmyadmin
+FROM phpmyadmin:${BASE_IMAGE_VERSION} AS phpmyadmin
 
-FROM alpine:3 as phpmyadmin-themes
+FROM alpine:3 AS phpmyadmin-themes
 WORKDIR /src/
 RUN set -eux \
     && apk add --quiet --no-cache \