diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index add13118c..25c83e0d1 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -18,23 +18,48 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
-    name: Linux Java ${{ matrix.java }} Maven
+  buildWithoutTests:
+    name: BuildWithoutTests
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         java: [11]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Cache .m2 registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
+      - name: Install DMP
+        run: mvn ${MAVEN_ARGS} clean install -DskipTests -Djacoco.skip=true
+
+  build:
+    name: Linux
+    runs-on: ubuntu-latest
+    needs: buildWithoutTests
+    strategy:
+      fail-fast: false
+      matrix:
+        docker: [v25.0.2, v24.0.9, v23.0.6, v20.10.24]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Install Docker Maven Plugin
-        run: mvn ${MAVEN_ARGS} clean install -DskipTests -Djacoco.skip=true
+          java-version: '11'
+      - name: Cache .m2 registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-e2e-${{ github.sha }}-${{ github.run_id }}
+      - name: Set up Docker
+        uses: crazy-max/ghaction-setup-docker@v2
+        with:
+          version: ${{ matrix.docker }}
       - name: Run Integration tests
         run: |
           cd it/
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
new file mode 100644
index 000000000..c86809250
--- /dev/null
+++ b/.github/workflows/e2e-windows.yml
@@ -0,0 +1,35 @@
+name: E2E Tests
+
+env:
+  MAVEN_ARGS: -B -C -V -ntp -Dhttp.keepAlive=false -e
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: '0 1 * * *' # Every day at 1
+
+jobs:
+  windows-build:
+    name: Windows
+    runs-on: windows-latest
+    steps:
+      - name: Get Windows Version > Used to retrieve specific Docker Image
+        shell: cmd
+        run: |
+          ver
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+      - name: Install DMP
+        run: mvn ${MAVEN_ARGS} clean install -DskipTests
+      - name: Run Integration tests
+        run: |
+          cd it/windows-build
+          mvn clean install -Pwindows
diff --git a/it/pom.xml b/it/pom.xml
index 5b9c694f6..7fd833dcb 100644
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -44,5 +44,6 @@
     <module>spring-boot-with-jib</module>
     <module>volume</module>
     <module>zero-config</module>
+    <module>windows-build</module>
   </modules>
 </project>
diff --git a/it/windows-build/pom.xml b/it/windows-build/pom.xml
new file mode 100644
index 000000000..2aa1a6976
--- /dev/null
+++ b/it/windows-build/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.fabric8.dmp.itests</groupId>
+    <artifactId>dmp-it-parent</artifactId>
+    <version>0.44-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <groupId>fabric8io</groupId>
+  <artifactId>dmp-it-windows-build</artifactId>
+  <version>0.44-SNAPSHOT</version>
+
+  <profiles>
+    <profile>
+      <id>windows</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>io.fabric8</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <configuration>
+              <images>
+                <image>
+                  <name>%g/%a:${project.version}</name>
+                  <build>
+                    <from>mcr.microsoft.com/windows/nanoserver:ltsc2022</from>
+                    <assembly>
+                      <descriptorRef>artifact</descriptorRef>
+                    </assembly>
+                  </build>
+                </image>
+              </images>
+            </configuration>
+
+            <executions>
+              <execution>
+                <id>build</id>
+                <goals>
+                  <goal>build</goal>
+                </goals>
+                <phase>pre-integration-test</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>