diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile
index dd4574d6b5..89af112145 100644
--- a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile
+++ b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile
@@ -79,9 +79,9 @@ RUN update-alternatives --set python /usr/bin/python3.9 && \
 
 # Add k-NN Library dependencies
 # EL8 requires install config-manager and enable powertools to consume openblas-static
-RUN dnf install epel-release -y && dnf repolist && \
-    dnf install -y 'dnf-command(config-manager)' && \
+RUN dnf install -y 'dnf-command(config-manager)' && \
     dnf config-manager --set-enabled powertools && \
+    dnf install epel-release -y && dnf repolist && \
     dnf install openblas-static lapack gcc-gfortran -y && dnf clean all
 RUN pip3 install cmake==3.23.3
 
diff --git a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/legacy/build.centos7.opensearch.x64.arm64.dockerfile
similarity index 99%
rename from docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile
rename to docker/ci/dockerfiles/legacy/build.centos7.opensearch.x64.arm64.dockerfile
index ec46156328..56bd2edeae 100644
--- a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile
+++ b/docker/ci/dockerfiles/legacy/build.centos7.opensearch.x64.arm64.dockerfile
@@ -89,7 +89,7 @@ RUN ln -sfn /usr/local/bin/python3.9 /usr/bin/python3 && \
 # Add k-NN Library dependencies
 RUN yum install epel-release -y && yum repolist && yum install openblas-static lapack gcc-gfortran -y
 RUN pip3 install cmake==3.23.3
-# Upgrade gcc8
+# Upgrade gcc
 # The setup part is partially based on Austin Dewey's article:
 # https://austindewey.com/2019/03/26/enabling-software-collections-binaries-on-a-docker-image/
 RUN yum install -y centos-release-scl && yum install -y devtoolset-7 && yum clean all && \