diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c6840a..5db8c65 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [2019,2022]
+        os: [2019,2022,2025]
 
     env:
       BASE: ${{ matrix.os }}
@@ -151,11 +151,13 @@ jobs:
           docker manifest create ${{ env.IMAGE }} \
             ${{ env.IMAGE }}:linux-amd64 \
             ${{ env.IMAGE }}:windows-2019 \
-            ${{ env.IMAGE }}:windows-2022
+            ${{ env.IMAGE }}:windows-2022 \
+            ${{ env.IMAGE }}:windows-2025
           docker manifest create ${{ env.IMAGE }}:${{ env.VERSION }} \
             ${{ env.IMAGE }}:${{ env.VERSION }}-linux-amd64 \
             ${{ env.IMAGE }}:${{ env.VERSION }}-windows-2019 \
-            ${{ env.IMAGE }}:${{ env.VERSION }}-windows-2022
+            ${{ env.IMAGE }}:${{ env.VERSION }}-windows-2022 \
+            ${{ env.IMAGE }}:${{ env.VERSION }}-windows-2025
 
       - name: Publish the Docker multiarch manifest
         run: |
diff --git a/bin/init.sh b/bin/init.sh
index ca019a7..974dd47 100755
--- a/bin/init.sh
+++ b/bin/init.sh
@@ -17,5 +17,5 @@ patch=${BASH_REMATCH[3]}
 
 
 VERSION="${major}.${minor}.${patch}"
-echo "VERSION=${VERSION}" >> $GITHUB_ENV
+echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
 echo "Found version: ${VERSION}"
diff --git a/windows/Dockerfile.2025 b/windows/Dockerfile.2025
new file mode 100644
index 0000000..67ac5d5
--- /dev/null
+++ b/windows/Dockerfile.2025
@@ -0,0 +1,39 @@
+# escape=`
+
+# renovate: datasource=github-releases depName=docuum packageName=stepchowfun/docuum
+ARG DOCUUM_VERSION=0.25.0
+
+# renovate: datasource=github-releases depName=docker packageName=moby/moby
+ARG DOCKER_VERSION=27.4.1
+
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025@sha256:2cf953420d355e2bb428f03c4df80eadb8acad24c9ea8df4da3f7c75d4651310
+
+USER ContainerAdministrator
+
+LABEL maintainer="Michael Kriese <michael.kriese@visualon.de>" `
+  org.opencontainers.image.authors="Michael Kriese <michael.kriese@visualon.de>" `
+  org.opencontainers.image.licenses="MIT" `
+  org.opencontainers.image.source="https://github.com/visualon/docker-docuum" `
+  org.opencontainers.image.url="https://github.com/visualon/docker-docuum"
+
+ENTRYPOINT ["/bin/docuum"]
+
+#ENV DOCKER_HOST=npipe:////./pipe/docker_engine
+
+
+RUN mkdir bin
+RUN setx /M PATH "c:\bin;%PATH%" > nul
+
+ARG DOCKER_VERSION
+RUN `
+  curl -sSfLo file.zip https://download.docker.com/win/static/stable/x86_64/docker-%DOCKER_VERSION%.zip `
+  && tar -C /bin -oxzf file.zip --strip 1 docker/docker.exe `
+  && del /f file.zip `
+  && docker --version
+
+ARG DOCUUM_VERSION
+LABEL org.opencontainers.image.version="${DOCUUM_VERSION}"
+
+RUN `
+	curl -sSfLo bin/docuum.exe https://github.com/stepchowfun/docuum/releases/download/v%DOCUUM_VERSION%/docuum-x86_64-pc-windows-msvc.exe `
+  && docuum --version