diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml
new file mode 100644
index 0000000000..cf8774df05
--- /dev/null
+++ b/.github/workflows/buildDocker.yml
@@ -0,0 +1,43 @@
+name: Build Docker Images
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+
+      - name: Build project
+        run: mvn clean install -Pdocker -Ddocker.skip-test=true -pl -jmxterm
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_KEY }}
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: base
+          file: base/Dockerfile.ubi8
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: thinkportgmbh/cp-base-new:7.0.1
+          build-args: |
+            ARTIFACT_ID=cp-base-new
+            PROJECT_VERSION=7.0.1
+
diff --git a/base/pom.xml b/base/pom.xml
index f49eb290af..8a11c3e765 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -80,8 +80,8 @@
         </dependency>
     </dependencies>
 
-      <!-- This jar is only used by the deb8 base image and does not get added to the other images. -->
-      <build>
+    <!-- This jar is only used by the deb8 base image and does not get added to the other images. -->
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -111,25 +111,17 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <buildArgs>
-                        <UBI_MINIMAL_VERSION>${ubi.image.version}</UBI_MINIMAL_VERSION>
-                        <OPENSSL_VERSION>-${ubi.openssl.version}</OPENSSL_VERSION>
-                        <WGET_VERSION>-${ubi.wget.version}</WGET_VERSION>
-                        <NETCAT_VERSION>-${ubi.netcat.version}</NETCAT_VERSION>
-                        <PYTHON36_VERSION>-${ubi.python36.version}</PYTHON36_VERSION>
-                        <TAR_VERSION>-${ubi.tar.version}</TAR_VERSION>
-                        <PROCPS_VERSION>-${ubi.procps.version}</PROCPS_VERSION>
-                        <KRB5_WORKSTATION_VERSION>-${ubi.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
-                        <IPUTILS_VERSION>-${ubi.iputils.version}</IPUTILS_VERSION>
-                        <HOSTNAME_VERSION>-${ubi.hostname.version}</HOSTNAME_VERSION>
-                        <ZULU_OPENJDK_VERSION>-${ubi.zulu.openjdk.version}</ZULU_OPENJDK_VERSION>
-                        <PYTHON_PIP_VERSION>==${ubi.python.pip.version}</PYTHON_PIP_VERSION>
-                        <PYTHON_SETUPTOOLS_VERSION>==${ubi.python.setuptools.version}</PYTHON_SETUPTOOLS_VERSION>
-                        <PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>${ubi.python.confluent.docker.utils.version}</PYTHON_CONFLUENT_DOCKER_UTILS_VERSION>
-                        <SKIP_SECURITY_UPDATE_CHECK>${docker.skip-security-update-check}</SKIP_SECURITY_UPDATE_CHECK>
-                    </buildArgs>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 2dfa4f3203..b8d51894d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,19 +32,21 @@
         <docker.tag>${io.confluent.common-docker.version}-${docker.os_type}</docker.tag>
         <io.confluent.common-docker.version>7.0.1</io.confluent.common-docker.version>
         <!-- Versions-->
-        <ubi.image.version>8.5-204</ubi.image.version>
+        <ubi.image.version>8.6-854</ubi.image.version>
         <!-- Redhat Package Versions -->
-        <ubi.openssl.version>1.1.1k-4.el8</ubi.openssl.version>
+        <ubi.openssl.version>1.1.1k-6.el8_5</ubi.openssl.version>
         <ubi.wget.version>1.19.5-10.el8</ubi.wget.version>
         <ubi.netcat.version>7.70-6.el8</ubi.netcat.version>
         <ubi.python36.version>3.6.8-38.module+el8.5.0+12207+5c5719bc</ubi.python36.version>
         <ubi.tar.version>1.30-5.el8</ubi.tar.version>
         <ubi.procps.version>3.3.15-6.el8</ubi.procps.version>
         <ubi.krb5.workstation.version>1.18.2-14.el8</ubi.krb5.workstation.version>
-        <ubi.iputils.version>20180629-7.el8</ubi.iputils.version>
+        <ubi.iputils.version>20180629-9.el8</ubi.iputils.version>
         <ubi.hostname.version>3.20-6.el8</ubi.hostname.version>
+        <ubi.xzlibs.version>5.2.4-4.el8_6</ubi.xzlibs.version>
+        <ubi.glibc.version>2.28-189.5.el8_6</ubi.glibc.version>
         <!-- ZULU OpenJDK Package Version -->
-        <ubi.zulu.openjdk.version>11.0.13</ubi.zulu.openjdk.version>
+        <ubi.zulu.openjdk.version>11.0.15-1</ubi.zulu.openjdk.version>
         <!-- Python Module Versions -->
         <ubi.python.pip.version>21.*</ubi.python.pip.version>
         <ubi.python.setuptools.version>54.*</ubi.python.setuptools.version>
@@ -56,4 +58,10 @@
         `-Ddocker.skip-security-update-check=true` -->
         <docker.skip-security-update-check>false</docker.skip-security-update-check>
     </properties>
+    <repositories>
+        <repository>
+            <id>confluent</id>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
 </project>