diff --git a/.github/workflows/publish-php-debug-images.yml b/.github/workflows/publish-php-debug-images.yml
index 80fc56e8..f8454aaf 100644
--- a/.github/workflows/publish-php-debug-images.yml
+++ b/.github/workflows/publish-php-debug-images.yml
@@ -41,7 +41,7 @@ jobs:
           echo "Latest version in ${{ matrix.php-version }} is ${PHP_VERSION}"
 
       - name: Build and push ${{ env.PHP_VERSION }} as ${{ matrix.php-version }}-${{ matrix.os }} to ghcr.io
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: docker/Dockerfile.${{ matrix.os }}
diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine
index 8c49116a..7c3c76bf 100644
--- a/docker/Dockerfile.alpine
+++ b/docker/Dockerfile.alpine
@@ -1,18 +1,8 @@
 ARG ALPINE_VERSION=alpine:3.20
-FROM ${ALPINE_VERSION} as builder
+FROM ${ALPINE_VERSION} AS builder
 WORKDIR /usr/src
 
-ENV PHPIZE_DEPS \
-    autoconf \
-    dpkg-dev \
-    dpkg \
-    file \
-    g++ \
-    gcc \
-    libc-dev \
-    make \
-    pkgconf \
-    re2c
+ENV PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c"
 
 RUN apk add --no-cache \
     ${PHPIZE_DEPS} \
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
index 0ad6d4aa..0a24961c 100644
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@@ -16,16 +16,7 @@ RUN apt-get update \
     gdbserver \
     valgrind
 
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkg-config \
-		re2c
+ENV PHPIZE_DEPS="autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c"
 
 RUN apt-get update -y \
   && apt-get install -y \