diff --git a/.circleci/config.yml b/.circleci/config.yml
index 169a661d..9e21f6f9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,36 +260,25 @@ build_push_image_steps: &build_push_image_steps
     - checkout
 
     - setup_remote_docker:
-        version: 20.10.11
+        version: 20.10.7
 
+    # build the application image
     - run:
-        name: Install cURL on Alpine Linux
-        command: |
-          echo ""
-          apk --no-cache add curl && curl --version
-          
-    - run:
-        name: Install Docker Buildx
-        command: |
-          mkdir -vp ~/.docker/cli-plugins/
-          curl --silent -L "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
-          chmod a+x ~/.docker/cli-plugins/docker-buildx
-          docker buildx version
+        name: Building Docker image
+        working_directory: ~/repo/docker/jdk<< parameters.jdk_version >>
+        command: docker build --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> .
 
     - run:
         name: Authenticating to Docker Hub
         command: |
           echo "$DOCKER_HUB_PASSWORD" | docker login --username "$DOCKER_HUB_USER" --password-stdin
 
+    # deploy the image
     - run:
-        name: Building and Pushing Multi Arch Docker images
+        name: Pushing Docker image to Docker Hub
         working_directory: ~/repo/docker/jdk<< parameters.jdk_version >>
-        command: |
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker context create tls-environment-jdk-<< parameters.jdk_version >>
-          docker buildx create tls-environment-jdk-<< parameters.jdk_version >> --use
-          docker buildx build --platform linux/arm64,linux/amd64 -f Dockerfile --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> --push .
-          docker context rm tls-environment-jdk-<< parameters.jdk_version >>
+        command: docker push azagniotov/stubby4j:latest-jre<< parameters.jdk_version >>
+
 
 smoke_test_steps: &smoke_test_steps
   steps:
@@ -697,7 +686,7 @@ workflows:
   master-twelve-hour-jdk8:
     triggers:
       - schedule:
-          cron: "10 6,18 * * *"
+          cron: "10 7,19 * * *"
           <<: *filter_only_master
     jobs:
       - gradle_7_2_0_jdk8:
@@ -725,7 +714,7 @@ workflows:
   master-twelve-hour-jdk16:
     triggers:
       - schedule:
-          cron: "20 8,20 * * *"
+          cron: "20 7,19 * * *"
           <<: *filter_only_master
     jobs:
       - gradle_7_2_0_jdk16:
diff --git a/docker/jdk11/Dockerfile b/docker/jdk11/Dockerfile
index f321fd96..2a7f2488 100644
--- a/docker/jdk11/Dockerfile
+++ b/docker/jdk11/Dockerfile
@@ -10,7 +10,7 @@
 ########################################################################################
 # Stage 1 : build the app
 ########################################################################################
-FROM gradle:7.2.0-jdk11-openj9@sha256:68d2abb7a3dafef89b9f387095ebe2f7059dca48c53d83fd9328bf5914ce14a6 AS BUILD_JAR_STAGE
+FROM gradle:7.2.0-jdk11-openj9@sha256:6c628ab1edc7b733b4880804fcd27dc360fc350f333546924e64e3a34a009fa2 AS BUILD_JAR_STAGE
 
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
@@ -27,7 +27,7 @@ RUN git clone https://github.com/azagniotov/stubby4j.git && \
 # Stage 2 : create the Docker final image
 ########################################################################################
 # https://hub.docker.com/r/azul/zulu-openjdk-alpine
-FROM azul/zulu-openjdk-alpine:11.0.21-11.68-jre-headless@sha256:95750d3048415315d22effd433373f1ecd543be17fb658c650207db6c837ec09
+FROM azul/zulu-openjdk-alpine:11.0.10-11.45.27-jre-headless@sha256:6cf54cbe8eef8a65eee89524dc9fcac4069425e87115ba908901f97c933703e8
 
 ARG USER_ID=1001
 ARG GROUP_ID=1001
diff --git a/docker/jdk16/Dockerfile b/docker/jdk16/Dockerfile
index 2ebc79b9..1d17ac12 100644
--- a/docker/jdk16/Dockerfile
+++ b/docker/jdk16/Dockerfile
@@ -10,7 +10,7 @@
 ########################################################################################
 # Stage 1 : build the app
 ########################################################################################
-FROM gradle:7.2.0-jdk17@sha256:e9e90cc97b29423dda5a2ff5ed7787a31ab7f43660bd83993a880e33e1504c7b AS BUILD_JAR_STAGE
+FROM gradle:7.2.0-jdk16-openj9@sha256:9620865af4f35026abfc9680603449296f832ea79da9a7f4e79d00989ccddcee AS BUILD_JAR_STAGE
 
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
@@ -27,7 +27,7 @@ RUN git clone https://github.com/azagniotov/stubby4j.git && \
 # Stage 2 : create the Docker final image
 ########################################################################################
 # https://hub.docker.com/r/azul/zulu-openjdk-alpine
-FROM azul/zulu-openjdk-alpine:17-jre@sha256:1d30a12d48c20c02dbcfe9e01c5a41878066c4ddaf1e5cd768ea87f2ba212973
+FROM azul/zulu-openjdk-alpine:16.0.2-16.32.15-jre@sha256:d323c348f27b9458ec88fd69947560314df0fe059ff7acb3055f96b28f466a4d
 
 ARG USER_ID=1001
 ARG GROUP_ID=1001
diff --git a/docker/jdk8/Dockerfile b/docker/jdk8/Dockerfile
index f2847e20..e465fdd2 100644
--- a/docker/jdk8/Dockerfile
+++ b/docker/jdk8/Dockerfile
@@ -10,7 +10,7 @@
 ########################################################################################
 # Stage 1 : build the app
 ########################################################################################
-FROM gradle:7.2.0-jdk8-openj9@sha256:18fdc03987ce333918cf2badfcb677d27ac1ca667b014eef32ba77b48e58ab83 AS BUILD_JAR_STAGE
+FROM gradle:7.2.0-jdk8-openj9@sha256:d4128edf5ac579f93e3149a9f89be3af779de1d3d85a9f25f25cb3d4b432b69a AS BUILD_JAR_STAGE
 
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
@@ -27,7 +27,7 @@ RUN git clone https://github.com/azagniotov/stubby4j.git && \
 # Stage 2 : create the Docker final image
 ########################################################################################
 # https://hub.docker.com/r/azul/zulu-openjdk-alpine
-FROM azul/zulu-openjdk-alpine:8u362-8.68.0.21-jre-arm64@sha256:460ae0fb1205fdca85d909d58a31c4691c9d52764391031e387854c48ba7c6d8
+FROM azul/zulu-openjdk-alpine:8u282-8.52.0.23-jre-headless@sha256:91fe8ae651d5c778312e946e89f934240c2a80f55b7ca894d76daef8f5281375
 
 ARG USER_ID=1001
 ARG GROUP_ID=1001