diff --git a/Dockerfile b/Dockerfile
index 1138772..bd30702 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,25 +1,16 @@
-FROM centos:7
-# beacon env
-ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
+FROM --platform=$TARGETPLATFORM rockylinux:8.8
 
-RUN yum -q -qy update \
-    && yum -qy install --setopt=tsflags=nodocs epel-release \
-    && yum -qy install curl cronie supervisor \
-    && yum clean all \
-    && rm -rf /var/cache/yum
-
-# Install Corretto Java JDK
-#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html
-ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jdk.rpm
-ARG CORRETTO_RPM=amazon-corretto-17-x64-linux-jdk.rpm
-COPY containerfiles/corretto-signing-key.pub .
-RUN curl -O -L $CORRETTO_URL_PERM \
-    && rpm --import corretto-signing-key.pub \
-    && rpm -K $CORRETTO_RPM \
-    && rpm -i $CORRETTO_RPM \
-    && rm -r corretto-signing-key.pub $CORRETTO_RPM
+# Install Corretto Java JDK (from Amazon repo, more arch independent)
+RUN rpm --import https://yum.corretto.aws/corretto.key \
+    && curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
+    && yum install -y java-17-amazon-corretto-devel
 ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto
 
+COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
+COPY containerfiles/users.txt /opt/shibui
+
+# beacon env
+ENV TIERVERSION=PACKAGE_2.0.0-BETA-R1
 ARG version=2.0.0-BETA-R1
 
 COPY bootstrapfiles/shibui-${version}.war.sha256sum .
@@ -28,10 +19,7 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers
     && sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
 
 RUN mkdir -p /opt/shibui
-run mv shibui.war /opt/shibui/shibui.war
-
-COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
-COPY containerfiles/users.txt /opt/shibui
+RUN mv shibui.war /opt/shibui/shibui.war
 
 # TIER Beacon Opt-out
 # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.