diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 10f6b5a..a7e4b69 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -69,7 +69,7 @@ jobs:
             SHORT_DESCRIPTION: "conda-forge build image for Cent0S 8 on aarch64 with CUDA"
 
           - DOCKERIMAGE: linux-anvil-alma-x86_64
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "amd64"
             DISTRO_NAME: "almalinux"
@@ -77,7 +77,7 @@ jobs:
             SHORT_DESCRIPTION: "conda-forge build image for Alma 8 on x86_64"
 
           - DOCKERIMAGE: linux-anvil-alma-aarch64
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "arm64"
             DISTRO_NAME: "almalinux"
@@ -85,7 +85,7 @@ jobs:
             SHORT_DESCRIPTION: "conda-forge build image for Alma 8 on aarch64"
 
           - DOCKERIMAGE: linux-anvil-alma-ppc64le
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "almalinux"
diff --git a/linux-anvil-alma/Dockerfile b/linux-anvil-alma/Dockerfile
deleted file mode 100644
index fb9b898..0000000
--- a/linux-anvil-alma/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-ARG DISTRO_ARCH
-ARG DISTRO_NAME
-ARG DISTRO_VER
-FROM --platform=linux/${DISTRO_ARCH} ${DISTRO_NAME}:${DISTRO_VER}
-
-LABEL maintainer="conda-forge <conda-forge@googlegroups.com>"
-
-ARG DISTRO_ARCH
-ARG DISTRO_NAME
-ARG DISTRO_VER
-ENV DISTRO_ARCH=${DISTRO_ARCH} \
-    DISTRO_NAME=${DISTRO_NAME} \
-    DISTRO_VER=${DISTRO_VER}
-
-# Set an encoding to make things work smoothly.
-ENV LANG en_US.UTF-8
-
-# Add qemu in here so that we can use this image on regular linux hosts with qemu user installed
-ADD qemu-aarch64-static /usr/bin/qemu-aarch64-static
-ADD qemu-ppc64le-static /usr/bin/qemu-ppc64le-static
-ADD qemu-s390x-static /usr/bin/qemu-s390x-static
-
-# bust the docker cache so that we always rerun the installs below
-ADD https://loripsum.net/api /opt/docker/etc/gibberish
-
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-
-# Install basic requirements.
-COPY scripts/yum_clean_all /opt/docker/bin/
-RUN yum update -y && \
-    yum install -y \
-        bzip2 \
-        glibc-minimal-langpack \
-        glibc-langpack-en \
-        sudo \
-        tar \
-        which && \
-    /opt/docker/bin/yum_clean_all
-
-# Run common commands
-COPY scripts/run_commands /opt/docker/bin/run_commands
-RUN /opt/docker/bin/run_commands
-
-# Add a file for users to source to activate the `conda`
-# environment `base`. Also add a file that wraps that for
-# use with the `ENTRYPOINT`.
-COPY linux-anvil-alma/entrypoint_source /opt/docker/bin/entrypoint_source
-COPY scripts/entrypoint /opt/docker/bin/entrypoint
-
-# Ensure that all containers start with tini and the user selected process.
-# Activate the `conda` environment `base`.
-# Provide a default command (`bash`), which will start if the user doesn't specify one.
-ENTRYPOINT [ "/opt/conda/bin/tini", "--", "/opt/docker/bin/entrypoint" ]
-CMD [ "/bin/bash" ]
diff --git a/linux-anvil-alma/entrypoint_source b/linux-anvil-alma/entrypoint_source
deleted file mode 100644
index 6dfd421..0000000
--- a/linux-anvil-alma/entrypoint_source
+++ /dev/null
@@ -1,2 +0,0 @@
-# Activate the `base` conda environment.
-conda activate base
diff --git a/linux-anvil-cos7/Dockerfile b/linux-anvil-cos7/Dockerfile
index 63d697f..630877f 100644
--- a/linux-anvil-cos7/Dockerfile
+++ b/linux-anvil-cos7/Dockerfile
@@ -39,12 +39,16 @@ RUN /opt/docker/bin/fix_rpm
 
 # Install basic requirements.
 COPY scripts/yum_clean_all /opt/docker/bin/
-RUN yum update -y && \
+RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux8" ]; then \
+      EXTRA_YUM_PKGS="glibc-minimal-langpack glibc-langpack-en" \
+    fi \
+    yum update -y && \
     yum install -y \
         bzip2 \
         sudo \
         tar \
-        which && \
+        which \
+        ${EXTRA_YUM_PKGS:-} && \
     /opt/docker/bin/yum_clean_all
 
 # Run common commands
diff --git a/scripts/fix_rpm b/scripts/fix_rpm
index d64b8bc..48ecab4 100755
--- a/scripts/fix_rpm
+++ b/scripts/fix_rpm
@@ -16,6 +16,8 @@ if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then
   fi
 elif [ "${DISTRO_NAME}${DISTRO_VER}" = "ubi8" ]; then
   rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+elif [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux8" ]; then
+  rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fi
 
 rm -rf "/tmp/centos7-repos"