diff --git a/Dockerfile b/Dockerfile
index eba392c..53c0543 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25 as builder
+FROM public.ecr.aws/docker/library/golang:1.25 as builder
 
 ## GOLANG env
 ARG GOPROXY="https://proxy.golang.org|direct"
@@ -22,7 +22,8 @@ RUN make build
 CMD ["/amazon-ec2-instance-selector/build/ec2-instance-selector"]
 
 # Copy the binary into a thin image
-FROM amazonlinux:2 as amazonlinux
+FROM public.ecr.aws/amazonlinux/amazonlinux:2023-minimal as amazonlinux
+
 FROM scratch
 WORKDIR /
 COPY --from=builder /amazon-ec2-instance-selector/build/ec2-instance-selector .
diff --git a/README.md b/README.md
index 442951e..3ce5a3e 100644
--- a/README.md
+++ b/README.md
@@ -2,26 +2,19 @@
 
 <h4>A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory.</h4>
 
+![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/aws/amazon-ec2-instance-selector)
+[![GitHub License](https://img.shields.io/github/license/aws/amazon-ec2-instance-selector)](https://opensource.org/licenses/Apache-2.0)
+[![Docker Pulls](https://img.shields.io/docker/pulls/amazon/amazon-ec2-instance-selector)](https://hub.docker.com/r/amazon/amazon-ec2-instance-selector)
+
 <p>
-  <a href="https://golang.org/doc/go1.23">
-    <img src="https://img.shields.io/github/go-mod/go-version/aws/amazon-ec2-instance-selector?color=blueviolet" alt="go-version">
-  </a>
-  <a href="https://opensource.org/licenses/Apache-2.0">
-    <img src="https://img.shields.io/badge/License-Apache%202.0-ff69b4.svg" alt="license">
-  </a>
   <a href="https://goreportcard.com/report/github.com/aws/amazon-ec2-instance-selector">
     <img src="https://goreportcard.com/badge/github.com/aws/amazon-ec2-instance-selector" alt="go-report-card">
   </a>
-  <a href="https://hub.docker.com/r/amazon/amazon-ec2-instance-selector">
-    <img src="https://img.shields.io/docker/pulls/amazon/amazon-ec2-instance-selector" alt="docker-pulls">
-  </a>
 </p>
 
 ![EC2 Instance Selector CI and Release](https://github.com/aws/amazon-ec2-instance-selector/workflows/EC2%20Instance%20Selector%20CI%20and%20Release/badge.svg)
 
-<div>
-<hr>
-</div>
+---
 
 ## Summary
 
diff --git a/test/license-test/Dockerfile b/test/license-test/Dockerfile
index 08ed3f9..3982e3e 100644
--- a/test/license-test/Dockerfile
+++ b/test/license-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/golang:1.23
+FROM public.ecr.aws/docker/library/golang:1.25
 
 WORKDIR /app
 
diff --git a/test/readme-test/rundoc-Dockerfile b/test/readme-test/rundoc-Dockerfile
index eadb0e4..e9d3ace 100644
--- a/test/readme-test/rundoc-Dockerfile
+++ b/test/readme-test/rundoc-Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM public.ecr.aws/docker/library/python:3
 
 
 RUN pip3 install rundoc
diff --git a/test/readme-test/spellcheck-Dockerfile b/test/readme-test/spellcheck-Dockerfile
index 974f58a..500ed38 100644
--- a/test/readme-test/spellcheck-Dockerfile
+++ b/test/readme-test/spellcheck-Dockerfile
@@ -1,5 +1,5 @@
-FROM golang:1.23
+FROM public.ecr.aws/docker/library/golang:1.25
 
 RUN go install github.com/client9/misspell/cmd/misspell@v0.3.4
 
-CMD [ "/go/bin/misspell" ]
\ No newline at end of file
+CMD [ "/go/bin/misspell" ]