diff --git a/gentoo-base.Dockerfile b/gentoo-base.Dockerfile
index e0a7907..bbcb460 100644
--- a/gentoo-base.Dockerfile
+++ b/gentoo-base.Dockerfile
@@ -2,7 +2,7 @@
 FROM gentoo/portage:latest as portage
 
 # Build packages in /workdir.
-FROM gentoo/stage3-amd64-nomultilib:latest as build
+FROM gentoo/stage3:amd64-nomultilib as build
 COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
 RUN sed -i 's/-O2/-Os/' /etc/portage/make.conf
 RUN echo -e '\n# Added by tastytea/gentoo-base:' >> /etc/portage/make.conf
diff --git a/pkgcheck.Dockerfile b/pkgcheck.Dockerfile
index 17a5bc9..3e4dc44 100644
--- a/pkgcheck.Dockerfile
+++ b/pkgcheck.Dockerfile
@@ -5,7 +5,7 @@ FROM gentoo/portage:latest as portage
 FROM tastytea/gentoo-base:latest as gentoo-base
 
 # Build packages in /workdir.
-FROM gentoo/stage3-amd64-nomultilib:latest as build
+FROM gentoo/stage3:amd64-nomultilib as build
 COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
 COPY --from=gentoo-base / /workdir
 RUN cp /workdir/etc/portage/make.conf /etc/portage/make.conf
diff --git a/repoman.Dockerfile b/repoman.Dockerfile
index 77717cc..5857896 100644
--- a/repoman.Dockerfile
+++ b/repoman.Dockerfile
@@ -5,7 +5,7 @@ FROM gentoo/portage:latest as portage
 FROM tastytea/gentoo-base:latest as gentoo-base
 
 # Build packages in /workdir.
-FROM gentoo/stage3-amd64-nomultilib:latest as build
+FROM gentoo/stage3:amd64-nomultilib as build
 COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
 COPY --from=gentoo-base / /workdir
 RUN cp /workdir/etc/portage/make.conf /etc/portage/make.conf