diff --git a/.github/workflows/keycloak-docker-cd.yml b/.github/workflows/keycloak-docker-cd.yml
index 37550d8..bdb806c 100644
--- a/.github/workflows/keycloak-docker-cd.yml
+++ b/.github/workflows/keycloak-docker-cd.yml
@@ -16,7 +16,9 @@ jobs:
         submodules: true
 
     - name: Setup Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
+      with:
+        buildkitd-flags: --debug
 
     - name: Docker meta data
       id: docker-meta-data
@@ -32,7 +34,7 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
       
     - name: Build and push Keycloak Docker image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         platforms: linux/amd64,linux/arm64
diff --git a/.github/workflows/keycloak-docker-tag-cd.yml b/.github/workflows/keycloak-docker-tag-cd.yml
index c2de2e6..3ffb503 100644
--- a/.github/workflows/keycloak-docker-tag-cd.yml
+++ b/.github/workflows/keycloak-docker-tag-cd.yml
@@ -1,4 +1,4 @@
-name: Docker Tagged Image CD
+name: Keycloak Docker Tagged Image CD
 on:
   workflow_dispatch:
   push:
diff --git a/Dockerfile.keycloak b/Dockerfile.keycloak
index d790ba8..47e0a35 100644
--- a/Dockerfile.keycloak
+++ b/Dockerfile.keycloak
@@ -1,11 +1,3 @@
-FROM registry.access.redhat.com/ubi9 AS ubi-micro-build
-RUN mkdir -p /mnt/rootfs
-RUN dnf install --installroot /mnt/rootfs curl --releasever 9 --setopt install_weak_deps=false --nodocs -y && \
-    dnf --installroot /mnt/rootfs clean all && \
-    rpm --root /mnt/rootfs -e --nodeps setup
-
-
 FROM keycloak/keycloak:22.0.1
-COPY --from=ubi-micro-build /mnt/rootfs /
-HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD curl --fail http://localhost:8080 || exit 1
+HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD bash -c 'echo -n > /dev/tcp/127.0.0.1/8080'
 COPY ./src/main/resources/ClientFhirServerRealm.json /opt/keycloak/data/import/ClientFhirServerRealm.json
\ No newline at end of file