diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 1f72bddc..ad766132 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -72,25 +72,30 @@ jobs:
             esac
             branch=$(echo $target | cut -d'/' -f1)
             tags=$(echo $target | cut -d':' -f2-)
-            tag1=$(echo $tags | cut -d',' -f1)
-            tag2=$(echo $tags | cut -d',' -f2)
-            tag3=$(echo $tags | cut -d',' -f3)
+            push_tags=""
+            for tag in $(echo "$tags" | tr , ' '); do
+              if [ -z "$push_tags" ]; then
+                push_tags="${{ env.REPOSITORY }}:$tag"
+              else
+                push_tags="$push_tags,${{ env.REPOSITORY }}:$tag"
+              fi
+            done
             case $component in
             *alpine*)
               echo "CONTEXT=${branch}/${component}" >> ${GITHUB_ENV}
-              echo "ALPINETAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2},${{ env.REPOSITORY }}:${tag3}" >> ${GITHUB_ENV}
+              echo "ALPINETAGS=$push_tags" >> ${GITHUB_ENV}
               ;;
             *arm64*)
               echo "CONTEXT=${branch}/${component}/debian" >> ${GITHUB_ENV}
-              echo "ARM64TAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2},${{ env.REPOSITORY }}:${tag3}" >> ${GITHUB_ENV}
+              echo "ARM64TAGS=$push_tags" >> ${GITHUB_ENV}
               ;;
             *armhf*)
               echo "CONTEXT=${branch}/${component}/debian" >> ${GITHUB_ENV}
-              echo "ARMHFTAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2},${{ env.REPOSITORY }}:${tag3}" >> ${GITHUB_ENV}
+              echo "ARMHFTAGS=$push_tags" >> ${GITHUB_ENV}
               ;;
             *amd64*)
               echo "CONTEXT=${branch}/debian" >> ${GITHUB_ENV}
-              echo "AMD64TAGS=${{ env.REPOSITORY }}:${tag1},${{ env.REPOSITORY }}:${tag2},${{ env.REPOSITORY }}:${tag3}" >> ${GITHUB_ENV}
+              echo "AMD64TAGS=$push_tags" >> ${GITHUB_ENV}
               ;;
             esac
           done
diff --git a/Makefile b/Makefile
index 36c1a4e4..01ffc695 100644
--- a/Makefile
+++ b/Makefile
@@ -18,16 +18,16 @@
 IMAGE_NAME := fluent/fluentd
 X86_IMAGES := \
 	v1.18/alpine:v1.18.0-1.1,v1.18-1,edge \
-	v1.18/debian:v1.18.0-debian-amd64-1.1,v1.18-debian-amd64-1,edge-debian-amd64
+	v1.18/debian:v1.18.0-debian-amd64-1.1,v1.18-debian-amd64-1,v1.18.0-debian-amd64,edge-debian-amd64
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Define images for running on ARM platforms
 ARM_IMAGES := \
-	v1.18/armhf/debian:v1.18.0-debian-armhf-1.1,v1.18-debian-armhf-1,edge-debian-armhf \
+	v1.18/armhf/debian:v1.18.0-debian-armhf-1.1,v1.18-debian-armhf-1,v1.18.0-debian-armhf,edge-debian-armhf \
 
 # Define images for running on ARM64 platforms
 ARM64_IMAGES := \
-	v1.18/arm64/debian:v1.18.0-debian-arm64-1.1,v1.18-debian-arm64-1,edge-debian-arm64 \
+	v1.18/arm64/debian:v1.18.0-debian-arm64-1.1,v1.18-debian-arm64-1,v1.18.0-debian-arm64,edge-debian-arm64 \
 
 WINDOWS_IMAGES := \
 	v1.18/windows-ltsc2019:v1.18.0-windows-ltsc2019-1.1,v1.18-windows-ltsc2019-1 \