diff --git a/.pipelines/Dockerfile b/.pipelines/Dockerfile
index 4a3a3e4bbf..0cc7ed14ce 100644
--- a/.pipelines/Dockerfile
+++ b/.pipelines/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM docker.io/ubuntu:16.04
 RUN apt-get update && apt-get install -y software-properties-common sudo wget apt-utils apt-transport-https curl lsb-release gnupg jq
 RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb
diff --git a/Dockerfile.build b/Dockerfile.build
index be6e8b15b4..f087f951e5 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,8 @@
-FROM golang:1.17
+FROM docker.io/golang:1.17
 
 RUN apt-get update \
- && apt-get install -y zip \
- && apt-get install -y sudo libltdl-dev
+    && apt-get install -y zip \
+    && apt-get install -y sudo libltdl-dev
 
 COPY . /go/src/github.com/Azure/azure-container-networking
 
diff --git a/Dockerfile.cnm b/Dockerfile.cnm
index 009a63da70..4a24eaf4b6 100644
--- a/Dockerfile.cnm
+++ b/Dockerfile.cnm
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM docker.io/ubuntu:16.04
 ARG CNM_BUILD_DIR
 
 # Install dependencies.
diff --git a/Makefile b/Makefile
index 5c80e200e4..83c0e0758d 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ container-platform-tag: # util target to print the container tag
 	@echo $(subst /,-,$(PLATFORM))-$(TAG)
 
 containerize-buildah: # util target to build container images using buildah. do not invoke directly.
-	buildah build \
+	buildah bud \
 		--jobs 16 \
 		--platform $(PLATFORM) \
 		-f $(DOCKERFILE) \
diff --git a/cni/telemetry/Dockerfile b/cni/telemetry/Dockerfile
index 00b18da051..5076857c65 100644
--- a/cni/telemetry/Dockerfile
+++ b/cni/telemetry/Dockerfile
@@ -1,5 +1,5 @@
 # Use a minimal image as a parent image
-FROM ubuntu:19.10
+FROM docker.io/ubuntu:19.10
 ARG TELEMETRY_BUILD_DIR
 ARG TELEMETRY_CONF_DIR
 
@@ -10,4 +10,4 @@ COPY $TELEMETRY_CONF_DIR/azure-vnet-telemetry.config /usr/bin
 WORKDIR /usr/bin
 
 # Run below command by default when the container starts.
-ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/azure-vnet-telemetry", "-d", "/usr/bin"]
diff --git a/cns/Dockerfile b/cns/Dockerfile
index 237f5950e2..ade6dae7a9 100644
--- a/cns/Dockerfile
+++ b/cns/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:latest as certs
+FROM docker.io/alpine:latest as certs
 RUN apk --update add ca-certificates
 
-FROM golang:1.17 AS builder
+FROM docker.io/golang:1.17 AS builder
 ARG VERSION
 ARG CNS_AI_PATH
 ARG CNS_AI_ID
diff --git a/cns/windows.Dockerfile b/cns/windows.Dockerfile
index aba4f8e6b6..c1791c149e 100644
--- a/cns/windows.Dockerfile
+++ b/cns/windows.Dockerfile
@@ -1,5 +1,5 @@
 # Build cns
-FROM golang:1.17 AS builder
+FROM docker.io/golang:1.17 AS builder
 # Build args
 ARG VERSION
 ARG CNS_AI_PATH
diff --git a/hack/toolbox/Dockerfile.windows b/hack/toolbox/Dockerfile.windows
index 04de01b5dc..4690bb5914 100644
--- a/hack/toolbox/Dockerfile.windows
+++ b/hack/toolbox/Dockerfile.windows
@@ -1,5 +1,5 @@
 # Build cns
-FROM golang:1.17 AS builder
+FROM docker.io/golang:1.17 AS builder
 # Build args
 ARG VERSION
 ARG CNS_AI_PATH
diff --git a/hack/toolbox/manifests/Dockerfile.heavy b/hack/toolbox/manifests/Dockerfile.heavy
index b6b07c1840..443f62fcc7 100644
--- a/hack/toolbox/manifests/Dockerfile.heavy
+++ b/hack/toolbox/manifests/Dockerfile.heavy
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM docker.io/ubuntu:20.04
 RUN apt-get update
 RUN apt-get install -y \
     python3 \
@@ -33,4 +33,4 @@ ENV PATH="/root/go/bin/:${PATH}"
 ADD ./server.go /app/
 WORKDIR /app 
 RUN go build -o main .
-CMD ["./main"]
\ No newline at end of file
+CMD ["./main"]
diff --git a/hack/toolbox/server/Dockerfile.heavy b/hack/toolbox/server/Dockerfile.heavy
index 45464ce066..62be6ffc6d 100644
--- a/hack/toolbox/server/Dockerfile.heavy
+++ b/hack/toolbox/server/Dockerfile.heavy
@@ -1,9 +1,9 @@
-FROM golang:alpine as build
+FROM docker.io/golang:alpine as build
 ADD ./ /
 WORKDIR /
 RUN CGO_ENABLED=0 GOOS=linux go build -o server .
 
-FROM alpine:latest
+FROM docker.io/alpine:latest
 RUN apk update 
 RUN apk add \
     axel \
diff --git a/hack/toolbox/server/Dockerfile.lite b/hack/toolbox/server/Dockerfile.lite
index bf09930c8d..f42883f990 100644
--- a/hack/toolbox/server/Dockerfile.lite
+++ b/hack/toolbox/server/Dockerfile.lite
@@ -1,4 +1,4 @@
-FROM golang as build
+FROM docker.io/golang as build
 ADD ./server/server.go /
 WORKDIR /
 RUN CGO_ENABLED=0 GOOS=linux go build -o server .
diff --git a/npm/Dockerfile b/npm/Dockerfile
index c5a53815ce..6184c0173e 100644
--- a/npm/Dockerfile
+++ b/npm/Dockerfile
@@ -1,5 +1,5 @@
 # Build npm
-FROM golang:1.17 AS builder
+FROM docker.io/golang:1.17 AS builder
 # Build args
 ARG VERSION
 ARG NPM_AI_PATH
@@ -14,7 +14,7 @@ COPY . .
 RUN CGO_ENABLED=0 go build -v -o /usr/local/bin/azure-npm -ldflags "-X main.version="$VERSION" -X "$NPM_AI_PATH"="$NPM_AI_ID"" -gcflags="-dwarflocationlists=true" npm/cmd/*.go
 
 # Use a minimal image as a final image base
-FROM ubuntu:focal
+FROM docker.io/ubuntu:focal
 
 # Copy into final image
 COPY --from=builder /usr/local/bin/azure-npm \
diff --git a/npm/Dockerfile.windows b/npm/Dockerfile.windows
index 0ff95fe08a..c526548233 100644
--- a/npm/Dockerfile.windows
+++ b/npm/Dockerfile.windows
@@ -1,4 +1,4 @@
-FROM golang:windowsservercore-ltsc2022 AS builder
+FROM docker.io/golang:windowsservercore-ltsc2022 AS builder
 # Build args
 ARG VERSION
 ARG NPM_AI_PATH
diff --git a/tools/acncli/Dockerfile b/tools/acncli/Dockerfile
index fcb004a186..7ff5a219ae 100644
--- a/tools/acncli/Dockerfile
+++ b/tools/acncli/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17 as build
+FROM docker.io/golang:1.17 as build
 WORKDIR /go/src/github.com/Azure/azure-container-networking/
 ARG VERSION
 ARG PLATFORM