diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 99d5f1d..b6f4941 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -32,6 +32,7 @@ jobs:
       - prepare
 
     strategy:
+      fail-fast: false
       matrix:
         base_image_vsn:
           - "5.0"
diff --git a/Dockerfile b/Dockerfile
index 09c8d9f..c9b3398 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ubuntu:22.04
+ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:22.04
 FROM ${BUILD_FROM}
 
 ENV EMQX_BUILDER_IMAGE=${BUILD_FROM}
diff --git a/alpine3.15.1/Dockerfile b/alpine3.15.1/Dockerfile
index f83ec61..3db7b13 100644
--- a/alpine3.15.1/Dockerfile
+++ b/alpine3.15.1/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=alpine:3.15.1
+ARG BUILD_FROM=public.ecr.aws/docker/library/alpine:3.15.1
 FROM ${BUILD_FROM}
 
 RUN apk add --no-cache --virtual .build-deps \
diff --git a/amzn2/Dockerfile b/amzn2/Dockerfile
index 3e0e76f..64ec0d3 100644
--- a/amzn2/Dockerfile
+++ b/amzn2/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=amazonlinux:2
+ARG BUILD_FROM=public.ecr.aws/amazonlinux/amazonlinux:2
 FROM ${BUILD_FROM}
 
 RUN yum update -y
diff --git a/amzn2023/Dockerfile b/amzn2023/Dockerfile
index 8e3924f..1f222e5 100644
--- a/amzn2023/Dockerfile
+++ b/amzn2023/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=amazonlinux:2023
+ARG BUILD_FROM=public.ecr.aws/amazonlinux/amazonlinux:2023
 FROM ${BUILD_FROM}
 
 RUN dnf -y update && \
diff --git a/debian10/Dockerfile b/debian10/Dockerfile
index 9a85b50..79c44b4 100644
--- a/debian10/Dockerfile
+++ b/debian10/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=debian:10
+ARG BUILD_FROM=public.ecr.aws/debian/debian:10
 FROM ${BUILD_FROM}
 
 # Avoid getting asked questions during installation (tzdata)
diff --git a/debian11/Dockerfile b/debian11/Dockerfile
index 0ac0ed0..75cb6da 100644
--- a/debian11/Dockerfile
+++ b/debian11/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=debian:11
+ARG BUILD_FROM=public.ecr.aws/debian/debian:11
 FROM ${BUILD_FROM}
 
 # Avoid getting asked questions during installation (tzdata)
diff --git a/debian12/Dockerfile b/debian12/Dockerfile
index 80dbff9..96ab016 100644
--- a/debian12/Dockerfile
+++ b/debian12/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=debian:12
+ARG BUILD_FROM=public.ecr.aws/debian/debian:12
 FROM ${BUILD_FROM}
 
 # Avoid getting asked questions during installation (tzdata)
diff --git a/debian9/Dockerfile b/debian9/Dockerfile
index 6e698e1..03efa06 100644
--- a/debian9/Dockerfile
+++ b/debian9/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=debian:9
+ARG BUILD_FROM=public.ecr.aws/debian/debian:9
 FROM ${BUILD_FROM}
 
 # Avoid getting asked questions during installation (tzdata)
diff --git a/el7/Dockerfile b/el7/Dockerfile
index 5cac904..b3e9479 100644
--- a/el7/Dockerfile
+++ b/el7/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=centos:7
+ARG BUILD_FROM=public.ecr.aws/docker/library/centos:7
 FROM ${BUILD_FROM}
 
 RUN yum install epel-release -y && yum update -y
diff --git a/el8/Dockerfile b/el8/Dockerfile
index c41cc74..31a72f6 100644
--- a/el8/Dockerfile
+++ b/el8/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=rockylinux:8
+ARG BUILD_FROM=public.ecr.aws/docker/library/rockylinux:8
 FROM ${BUILD_FROM}
 
 RUN yum install epel-release -y && yum update -y
diff --git a/el9/Dockerfile b/el9/Dockerfile
index eaf69eb..6c0d51e 100644
--- a/el9/Dockerfile
+++ b/el9/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=rockylinux:9
+ARG BUILD_FROM=public.ecr.aws/docker/library/rockylinux:9
 FROM ${BUILD_FROM}
 
 RUN dnf -y update && dnf -y groupinstall development
diff --git a/ubuntu18.04/Dockerfile b/ubuntu18.04/Dockerfile
index c615f13..b56fec9 100644
--- a/ubuntu18.04/Dockerfile
+++ b/ubuntu18.04/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ubuntu:18.04
+ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:18.04
 FROM ${BUILD_FROM}
 
 # Avoid getting asked questions during installation (tzdata)
diff --git a/ubuntu20.04/Dockerfile b/ubuntu20.04/Dockerfile
index 1d3eb98..faf3838 100644
--- a/ubuntu20.04/Dockerfile
+++ b/ubuntu20.04/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ubuntu:20.04
+ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:20.04
 FROM ${BUILD_FROM}
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/ubuntu22.04/Dockerfile b/ubuntu22.04/Dockerfile
index 067a174..4315787 100644
--- a/ubuntu22.04/Dockerfile
+++ b/ubuntu22.04/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ubuntu:22.04
+ARG BUILD_FROM=public.ecr.aws/ubuntu/ubuntu:22.04
 FROM ${BUILD_FROM}
 
 ENV DEBIAN_FRONTEND=noninteractive