diff --git a/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile
index d34d1fb34c..34b23cf1ff 100644
--- a/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile
+++ b/docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile
@@ -104,7 +104,12 @@ ENV CXX=g++
 RUN yum repolist && yum install lapack -y
 RUN git clone -b v0.3.27 --single-branch https://github.com/xianyi/OpenBLAS.git && \
     cd OpenBLAS && \
-    make USE_OPENMP=1 FC=gfortran && \
+    if [ "$(uname -m)" = "x86_64" ]; then \
+        echo "Machine is x86_64. Adding DYNAMIC_ARCH=1 to openblas make command."; \
+        make USE_OPENMP=1 FC=gfortran DYNAMIC_ARCH=1; \
+    else \
+        make USE_OPENMP=1 FC=gfortran; \
+    fi && \
     make PREFIX=/usr/local install
 ENV LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
 RUN pip3 install cmake==3.23.3
@@ -114,6 +119,6 @@ USER $CONTAINER_USER
 WORKDIR $CONTAINER_USER_HOME
 
 # Install fpm for opensearch dashboards core
-RUN gem install dotenv -v 2.8.1 && gem install fpm -v 1.14.2
+RUN gem install dotenv -v 2.8.1 && gem install public_suffix -v 5.1.1 && gem install fpm -v 1.14.2
 ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$PATH
 RUN fpm -v