diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12703fff..a1f0fef8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -288,11 +288,10 @@ build_push_image_steps: &build_push_image_steps
         name: Building and Pushing Multi Arch Docker images
         working_directory: ~/repo/docker/jdk<< parameters.jdk_version >>
         command: |
-          # docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           docker run --rm --privileged tonistiigi/binfmt --install all
           docker context create tls-environment
           docker buildx create tls-environment --use
-          docker buildx build --platform linux/amd64,linux/arm64 -f Dockerfile.arm64 --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> --push .
+          docker buildx build --build-arg REVISION=master --platform linux/amd64,linux/arm64 -f Dockerfile.arm64 --rm --no-cache -t azagniotov/stubby4j:latest-jre<< parameters.jdk_version >> --push .
           docker context rm tls-environment
 
 smoke_test_steps: &smoke_test_steps
@@ -708,42 +707,36 @@ workflows:
 
 
   master-twelve-hour-jdk8:
-    triggers:
-      - schedule:
-          cron: "10 4,16 * * *"
-          <<: *filter_only_master
     jobs:
       - gradle_7_2_0_jdk8:
           <<: *context_sonatype
+          <<: *filter_only_master
       - docker_build_latest_jre8:
           <<: *context_docker_hub
+          <<: *filter_only_master
           requires:
             - gradle_7_2_0_jdk8
 
 
   master-twelve-hour-jdk11:
-    triggers:
-      - schedule:
-          cron: "15 6,18 * * *"
-          <<: *filter_only_master
     jobs:
       - gradle_7_2_0_jdk11:
           <<: *context_sonatype
+          <<: *filter_only_master
       - docker_build_latest_jre11:
           <<: *context_docker_hub
+          <<: *filter_only_master
           requires:
             - gradle_7_2_0_jdk11
 
 
   master-twelve-hour-jdk17:
-    triggers:
-     - schedule:
-         cron: "20 8,20 * * *"
-         <<: *filter_only_master
     jobs:
       - gradle_7_2_0_jdk16:
           <<: *context_sonatype
+          <<: *filter_only_master
       - docker_build_latest_jre17:
           <<: *context_docker_hub
+          <<: *filter_only_master
           requires:
             - gradle_7_2_0_jdk16
diff --git a/docker/jdk11/Dockerfile.arm64 b/docker/jdk11/Dockerfile.arm64
index a5044237..811c9f0f 100644
--- a/docker/jdk11/Dockerfile.arm64
+++ b/docker/jdk11/Dockerfile.arm64
@@ -12,6 +12,11 @@
 ########################################################################################
 FROM gradle:7.2.0-jdk11-openj9@sha256:68d2abb7a3dafef89b9f387095ebe2f7059dca48c53d83fd9328bf5914ce14a6 AS BUILD_JAR_STAGE
 
+# https://stackoverflow.com/questions/72435016/docker-build-stuck-in-gradle-task
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
+ENTRYPOINT ["sleep"]
+CMD ["3000"]
+
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
 WORKDIR $GRADLE_USER_HOME
diff --git a/docker/jdk17/Dockerfile.arm64 b/docker/jdk17/Dockerfile.arm64
index bc46831f..e2c3a06d 100644
--- a/docker/jdk17/Dockerfile.arm64
+++ b/docker/jdk17/Dockerfile.arm64
@@ -12,6 +12,11 @@
 ########################################################################################
 FROM gradle:7.2.0-jdk17@sha256:e9e90cc97b29423dda5a2ff5ed7787a31ab7f43660bd83993a880e33e1504c7b AS BUILD_JAR_STAGE
 
+# https://stackoverflow.com/questions/72435016/docker-build-stuck-in-gradle-task
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
+ENTRYPOINT ["sleep"]
+CMD ["3000"]
+
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
 WORKDIR $GRADLE_USER_HOME
diff --git a/docker/jdk8/.dockerignore b/docker/jdk8/.dockerignore
new file mode 100644
index 00000000..6b8710a7
--- /dev/null
+++ b/docker/jdk8/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/docker/jdk8/Dockerfile.arm64 b/docker/jdk8/Dockerfile.arm64
index 002a15ad..8c1df37b 100644
--- a/docker/jdk8/Dockerfile.arm64
+++ b/docker/jdk8/Dockerfile.arm64
@@ -12,6 +12,11 @@
 ########################################################################################
 FROM gradle:7.2.0-jdk8-openj9@sha256:18fdc03987ce333918cf2badfcb677d27ac1ca667b014eef32ba77b48e58ab83 AS BUILD_JAR_STAGE
 
+# https://stackoverflow.com/questions/72435016/docker-build-stuck-in-gradle-task
+ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
+ENTRYPOINT ["sleep"]
+CMD ["3000"]
+
 ARG REVISION=master
 ENV GRADLE_USER_HOME=/home/gradle
 WORKDIR $GRADLE_USER_HOME