diff --git a/Dockerfile b/Dockerfile
index e0a8f8f87..81ea6a61a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazonlinux:latest as builder
+FROM public.ecr.aws/amazonlinux/amazonlinux:latest as builder
 
 # Fluent Bit version; update these for each release
 ENV FLB_VERSION 1.6.8
@@ -69,7 +69,7 @@ RUN cp conf/parsers*.conf /fluent-bit/parsers/
 ADD configs/parse-json.conf /fluent-bit/configs/
 ADD configs/minimize-log-loss.conf /fluent-bit/configs/
 
-FROM amazonlinux:latest
+FROM public.ecr.aws/amazonlinux/amazonlinux:latest
 RUN yum upgrade -y \
     && yum install -y openssl-devel \
           cyrus-sasl-devel \
diff --git a/Dockerfile.plugins b/Dockerfile.plugins
index d2b9c2305..687b59132 100644
--- a/Dockerfile.plugins
+++ b/Dockerfile.plugins
@@ -1,4 +1,4 @@
-FROM golang:1.13
+FROM public.ecr.aws/bitnami/golang:1.13
 ENV GO111MODULE on
 RUN go env -w GOPROXY=direct
 
diff --git a/integ/clean_cloudwatch/Dockerfile b/integ/clean_cloudwatch/Dockerfile
index c014b9c5b..3739f82b6 100644
--- a/integ/clean_cloudwatch/Dockerfile
+++ b/integ/clean_cloudwatch/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:latest
+FROM public.ecr.aws/bitnami/python:3.7
 
 RUN pip install boto3
 
diff --git a/integ/emf_logger/Dockerfile b/integ/emf_logger/Dockerfile
index ad84e6f90..3f32cb5b8 100644
--- a/integ/emf_logger/Dockerfile
+++ b/integ/emf_logger/Dockerfile
@@ -1,4 +1,6 @@
-FROM bash:4.4
+FROM public.ecr.aws/amazonlinux/amazonlinux:latest
+
+RUN yum upgrade -y && yum install -y bash
 
 COPY logscript.sh /
 
diff --git a/integ/logger/Dockerfile b/integ/logger/Dockerfile
index ad84e6f90..3f32cb5b8 100644
--- a/integ/logger/Dockerfile
+++ b/integ/logger/Dockerfile
@@ -1,4 +1,6 @@
-FROM bash:4.4
+FROM public.ecr.aws/amazonlinux/amazonlinux:latest
+
+RUN yum upgrade -y && yum install -y bash
 
 COPY logscript.sh /
 
diff --git a/integ/s3-logger/Dockerfile b/integ/s3-logger/Dockerfile
index 93e14cbba..e8f2c4d8b 100644
--- a/integ/s3-logger/Dockerfile
+++ b/integ/s3-logger/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazonlinux
+FROM public.ecr.aws/amazonlinux/amazonlinux:latest
 
 RUN yum upgrade -y
 RUN yum install -y openssl
diff --git a/integ/s3/Dockerfile b/integ/s3/Dockerfile
index 4d39d8cfb..820e8d6f2 100644
--- a/integ/s3/Dockerfile
+++ b/integ/s3/Dockerfile
@@ -1,5 +1,5 @@
 # Start from the latest golang base image
-FROM golang:latest
+FROM public.ecr.aws/bitnami/golang:1.13
 ENV GOPROXY=direct
 
 # Set the Current Working Directory inside the container
diff --git a/integ/validate_cloudwatch/Dockerfile b/integ/validate_cloudwatch/Dockerfile
index b8c666f98..b6faf6eb4 100644
--- a/integ/validate_cloudwatch/Dockerfile
+++ b/integ/validate_cloudwatch/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:latest
+FROM public.ecr.aws/bitnami/python:3.7
 
 RUN pip install boto3