diff --git a/FetchMigration/Dockerfile b/FetchMigration/Dockerfile
index e1e97edac..0eee3ce9a 100644
--- a/FetchMigration/Dockerfile
+++ b/FetchMigration/Dockerfile
@@ -1,4 +1,4 @@
-FROM opensearchproject/data-prepper:2.5.0
+FROM public.ecr.aws/opensearchproject/data-prepper:2.5.0
 COPY python/requirements.txt .
 
 # Install dependencies to local user directory
diff --git a/RFS/docker/Dockerfile b/RFS/docker/Dockerfile
index 8e01e5b15..a87613a76 100644
--- a/RFS/docker/Dockerfile
+++ b/RFS/docker/Dockerfile
@@ -1,5 +1,6 @@
 # Using same base image as other Java containers in this repo
-FROM openjdk:11-jre
+FROM public.ecr.aws/amazoncorretto/amazoncorretto:11-al2023-headless
+
 # Requires Gradle to genearte runtime jars initially
 COPY ./build/runtimeJars /rfs-app/jars
 WORKDIR /rfs-app
diff --git a/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy b/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy
index daa9262c4..edbc50fdf 100644
--- a/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy
+++ b/TrafficCapture/buildSrc/src/main/groovy/org/opensearch/migrations/common/CommonUtils.groovy
@@ -57,8 +57,8 @@ class CommonUtils {
                 runCommand("sed -i -e \"s|mirrorlist=|#mirrorlist=|g\" /etc/yum.repos.d/CentOS-* ;  sed -i -e \"s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g\" /etc/yum.repos.d/CentOS-*")
                 runCommand("yum -y install nmap-ncat")
             } else {
-                from 'openjdk:11-jre'
-                runCommand("apt-get update && apt-get install -y netcat")
+                from 'public.ecr.aws/amazoncorretto/amazoncorretto:11-al2023-headless'
+                runCommand("dnf update && dnf install -y nmap-ncat")
             }
 
             copyFile("jars", "/jars")
diff --git a/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile b/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile
index 57b951496..897b65233 100644
--- a/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile
+++ b/TrafficCapture/dockerSolution/src/main/docker/grafana/Dockerfile
@@ -1,3 +1,3 @@
-FROM grafana/grafana:latest
+FROM public.ecr.aws/bitnami/grafana:latest
 
 COPY datasources.yaml /usr/share/grafana/conf/provisioning/datasources/
diff --git a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile
index 007fc0c89..8d511f666 100644
--- a/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile
+++ b/TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile
@@ -1,13 +1,15 @@
-FROM ubuntu:jammy
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-ENV DEBIAN_FRONTEND noninteractive
+RUN dnf update -y
+RUN dnf install -y python3.9 python3-pip python3-devel \
+        java-11-amazon-corretto-devel java-11-amazon-corretto \
+        wget gcc glibc-devel git vim jq unzip less curl-minimal
+RUN pip3 install setuptools
+RUN pip3 install urllib3 opensearch-benchmark==1.2.0 awscurl tqdm awscli
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends python3.9 python3-pip python3-dev openjdk-11-jre-headless wget gcc libc-dev git curl vim jq unzip less && \
-    pip3 install urllib3 opensearch-benchmark==1.2.0 awscurl tqdm awscli
-RUN mkdir /root/kafka-tools
-RUN mkdir /root/kafka-tools/aws
+RUN mkdir -p /root/kafka-tools/aws
 
+# Set working directory
 WORKDIR /root/kafka-tools
 # Get kafka distribution and unpack to 'kafka'
 RUN wget -qO- https://archive.apache.org/dist/kafka/3.6.0/kafka_2.13-3.6.0.tgz | tar --transform 's!^[^/]*!kafka!' -xvz
diff --git a/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/nginx/Dockerfile b/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/nginx/Dockerfile
index 982dfb43f..374b390d7 100644
--- a/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/nginx/Dockerfile
+++ b/TrafficCapture/trafficCaptureProxyServerTest/src/main/docker/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25.1
+FROM public.ecr.aws/nginx/nginx:1.25-bookworm
 
 # Installing VIM for the sake of users who would like to exec shells in the webserver container.
 RUN apt-get update