diff --git a/base/centos8/Dockerfile b/base/oraclelinux9/Dockerfile
similarity index 81%
rename from base/centos8/Dockerfile
rename to base/oraclelinux9/Dockerfile
index e203960..97eeab2 100644
--- a/base/centos8/Dockerfile
+++ b/base/oraclelinux9/Dockerfile
@@ -1,11 +1,10 @@
 ################################################################################################################
-# escomp/base-centos8 Dockerfile                                                                                    #
+# escomp/base-oraclelinux9e                                                                                    #
 #--------------------------------------------------------------------------------------------------------------#
-# A base CentOS8 install + MPI, HDF5, NetCDF and PNetCDF, as well as other core packages for escomp containers #
+# A base OracleLinux9 install + MPI, HDF5, NetCDF and PNetCDF, plus other core packages for escomp containers  #
 ################################################################################################################
 
-# Use latest CentOS8:
-FROM centos:8
+FROM oraclelinux:9
 
 # First, we upate the default packages and install some other necessary ones - while this may give
 # some people updated versions of packages vs. others, these differences should not be numerically
@@ -14,7 +13,7 @@ FROM centos:8
 RUN yum -y update && \
     yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
     yum -y install vim emacs-nox git subversion which sudo csh make m4 cmake wget file byacc curl-devel zlib-devel && \
-    yum -y install perl-XML-LibXML gcc-gfortran gcc-c++ dnf-plugins-core python3 perl-core && \
+    yum -y install perl-XML-LibXML gcc-gfortran gcc-c++ dnf-plugins-core python3 pip perl-core && \
     yum -y install ftp xmlstarlet diffutils  && \
     yum -y install git-lfs latexmk texlive-amscls texlive-anyfontsize texlive-cmap texlive-fancyhdr texlive-fncychap \
                    texlive-dvisvgm texlive-metafont texlive-ec texlive-titlesec texlive-babel-english texlive-tabulary \ 
@@ -22,7 +21,7 @@ RUN yum -y update && \
                    texlive-times texlive-makeindex texlive-helvetic texlive-courier texlive-gsftopk texlive-dvips texlive-mfware texlive-dvisvgm && \
     pip3 install rst2pdf sphinx sphinxcontrib-programoutput && \
     pip3 install git+https://github.com/esmci/sphinx_rtd_theme.git@version-dropdown-with-fixes && \
-    dnf --enablerepo=powertools install -y blas-devel lapack-devel && \
+    dnf --enablerepo=ol9_codeready_builder install -y blas-devel lapack-devel && \
     ln -s /usr/bin/python3 /usr/bin/python && \
     echo '/usr/local/lib' > /etc/ld.so.conf.d/local.conf && \
     ldconfig && \
@@ -38,6 +37,7 @@ RUN mkdir /tmp/sources && \
     wget -q http://www.mpich.org/static/downloads/3.3.2/mpich-3.3.2.tar.gz && \
     tar zxf mpich-3.3.2.tar.gz && \
     cd mpich-3.3.2 && \
+    FFLAGS="-w -fallow-argument-mismatch -O2" \
     ./configure --prefix=/usr/local && \
     make -j 2 install && \
     rm -rf /tmp/sources 
@@ -52,25 +52,28 @@ RUN  mkdir /tmp/sources && \
      tar zxf hdf5-1.12.0.tar.gz && \
      cd hdf5-1.12.0 && \
      ./configure --prefix=/usr/local && \
-     make -j 2 install && \
-     cd /tmp/sources && \
-     wget -q ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-c-4.7.4.tar.gz  && \
-     tar zxf netcdf-c-4.7.4.tar.gz && \
+     make -j 2 install
+
+RUN  cd /tmp/sources && \
+     wget -q https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.7.4.tar.gz && \
+     tar zxf v4.7.4.tar.gz && \
      cd netcdf-c-4.7.4 && \
      ./configure --prefix=/usr/local && \
      make -j 2 install && \
-     ldconfig && \
-     cd /tmp/sources && \
-     wget -q ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-fortran-4.5.3.tar.gz && \
-     tar zxf netcdf-fortran-4.5.3.tar.gz && \
+     ldconfig
+
+RUN  cd /tmp/sources && \
+     wget -q https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.5.3.tar.gz && \
+     tar zxf v4.5.3.tar.gz && \
      cd netcdf-fortran-4.5.3 && \
      ./configure --prefix=/usr/local && \
      make -j 2 install && \
-     ldconfig && \
-     cd /tmp/sources && \
-     wget -q https://parallel-netcdf.github.io/Release/pnetcdf-1.12.1.tar.gz && \
-     tar zxf pnetcdf-1.12.1.tar.gz && \
-     cd pnetcdf-1.12.1 && \
+     ldconfig
+
+RUN  cd /tmp/sources && \
+     wget -q https://parallel-netcdf.github.io/Release/pnetcdf-1.12.2.tar.gz && \
+     tar zxf pnetcdf-1.12.2.tar.gz && \
+     cd pnetcdf-1.12.2 && \
      ./configure --prefix=/usr/local && \
      make -j 2 install && \
      ldconfig && \