diff --git a/.circleci/config.yml b/.circleci/config.yml
index af553c156..2301c69ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
+      JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64
 
     steps:
       - checkout
@@ -14,8 +14,8 @@ jobs:
           name: upgrading Java to open-jdk-12
           command: |
             # sudo apt update; sudo apt install -y wget
-            sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
-            sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
+            sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
+            sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
       - run:
           # checking for merge conflicts and merging locally if none exist
           name: merging ${CIRCLE_BRANCH} into develop locally
@@ -29,7 +29,7 @@ jobs:
       - run:
           name: javac -version
           command: |
-            export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
+            export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
             javac -version
       - run:
           name: Pulling Gradle cache
@@ -89,7 +89,7 @@ jobs:
       CODACY_MODULE: com.codacy.CodacyCoverageReporter
 
     docker:
-      - image: circleci/openjdk:11.0.3-jdk-stretch
+      - image: circleci/openjdk:13.0.1-jdk-buster
 
     steps:
       - run:
@@ -117,7 +117,7 @@ jobs:
     machine:
       image: ubuntu-1604:201903-01
     environment:
-      JAVA_HOME: /usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64
+      JAVA_HOME: /usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64
 
     steps:
       - checkout
@@ -126,8 +126,8 @@ jobs:
           command: |
             # sudo apt update; sudo apt install -y wget
 
-            sudo wget https://cdn.azul.com/zulu/bin/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -O /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz
-            sudo tar -zxf /tmp/zulu13.27.9-ca-jdk13-linux_x64.tar.gz -C /usr/lib/jvm
+            sudo wget https://cdn.azul.com/zulu/bin/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -O /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz
+            sudo tar -zxf /tmp/zulu13.28.11-ca-jdk13.0.1-linux_x64.tar.gz -C /usr/lib/jvm
       - run:
           name: Pulling Gradle cache
           command: |
@@ -142,7 +142,7 @@ jobs:
       - run:
           name: javac -version
           command: |
-            export PATH=/usr/lib/jvm/zulu13.27.9-ca-jdk13-linux_x64/bin:$PATH
+            export PATH=/usr/lib/jvm/zulu13.28.11-ca-jdk13.0.1-linux_x64/bin:$PATH
             javac -version
       - run:
           name: Gradle Build Prime and ScanInfo Shredder
diff --git a/acceptance-tests/Dockerfile b/acceptance-tests/Dockerfile
index bdbbb3dd3..fa775f8fd 100644
--- a/acceptance-tests/Dockerfile
+++ b/acceptance-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/auth-server/Dockerfile b/auth-server/Dockerfile
index 76cbe7cb6..414eceb0c 100644
--- a/auth-server/Dockerfile
+++ b/auth-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/ext-auth-provider/Dockerfile b/ext-auth-provider/Dockerfile
index ef6da7753..c9b55f69d 100644
--- a/ext-auth-provider/Dockerfile
+++ b/ext-auth-provider/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/ext-myinfo-emulator/Dockerfile b/ext-myinfo-emulator/Dockerfile
index 17be238cd..f725623eb 100644
--- a/ext-myinfo-emulator/Dockerfile
+++ b/ext-myinfo-emulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/ocsgw/Dockerfile b/ocsgw/Dockerfile
index 1bca58335..a8577be62 100644
--- a/ocsgw/Dockerfile
+++ b/ocsgw/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/prime/Dockerfile b/prime/Dockerfile
index 0c5d576a9..ea1a8fa1f 100644
--- a/prime/Dockerfile
+++ b/prime/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/prime/Dockerfile.test b/prime/Dockerfile.test
index 5f3cc3f03..4859f7e74 100644
--- a/prime/Dockerfile.test
+++ b/prime/Dockerfile.test
@@ -1,6 +1,6 @@
 # This Dockerfile is used when running locally using docker-compose for Acceptance Testing.
 
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/prime/cloudbuild.dev.yaml b/prime/cloudbuild.dev.yaml
index 0186972b2..e9f46b7da 100644
--- a/prime/cloudbuild.dev.yaml
+++ b/prime/cloudbuild.dev.yaml
@@ -50,7 +50,7 @@ steps:
       path: /root/out_zip
 # Build docker images
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$SHORT_SHA', '--cache-from', 'azul/zulu-openjdk:13', 'prime']
+    args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$SHORT_SHA', '--cache-from', 'azul/zulu-openjdk:13.0.1', 'prime']
     timeout: 120s
 # Deploy new docker image to Google Kubernetes Engine (GKE)
   - name: ubuntu
diff --git a/prime/cloudbuild.yaml b/prime/cloudbuild.yaml
index f802cd79a..2141a6b7f 100644
--- a/prime/cloudbuild.yaml
+++ b/prime/cloudbuild.yaml
@@ -50,7 +50,7 @@ steps:
       path: /root/out_zip
 # Build docker images
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$TAG_NAME', '--cache-from', 'azul/zulu-openjdk:13', 'prime']
+    args: ['build', '--tag=eu.gcr.io/$PROJECT_ID/prime:$TAG_NAME', '--cache-from', 'azul/zulu-openjdk:13.0.1', 'prime']
     timeout: 120s
 # Deploy new docker image to Google Kubernetes Engine (GKE)
   - name: ubuntu
diff --git a/scaninfo-shredder/Dockerfile b/scaninfo-shredder/Dockerfile
index bd04156a0..2f4631208 100644
--- a/scaninfo-shredder/Dockerfile
+++ b/scaninfo-shredder/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/scaninfo-shredder/Dockerfile.test b/scaninfo-shredder/Dockerfile.test
index d47fc2f81..befbedd6a 100644
--- a/scaninfo-shredder/Dockerfile.test
+++ b/scaninfo-shredder/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"
 
diff --git a/sim-administration/sm-dp-plus-emulator/Dockerfile b/sim-administration/sm-dp-plus-emulator/Dockerfile
index 6e139c8fc..995d2c49c 100644
--- a/sim-administration/sm-dp-plus-emulator/Dockerfile
+++ b/sim-administration/sm-dp-plus-emulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk:13
+FROM azul/zulu-openjdk:13.0.1
 
 LABEL maintainer="dev@redotter.sg"