diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6aeb15..7732dd4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,14 +24,15 @@ jobs:
             mkdir config build install
             . /opt/conda/bin/activate root
             conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy basemap scons opencv hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake
-            yum install -y uuid-devel x11-devel motif-devel jq
+            yum install -y uuid-devel x11-devel motif-devel jq gcc-gfortran
             ln -s /opt/conda/bin/cython /opt/conda/bin/cython3
             cd /opt/conda/lib
             unlink libuuid.so
             unlink libuuid.so.1
             ln -s /lib64/libuuid.so.1.3.0 libuuid.so
             ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1
-            yum install -y gcc-gfortran
+            cd /lib64
+            test -f libgfortran.so || ln -sv libgfortran.so.*.* libgfortran.so
 
       - run:
           name: Build SConfigISCE and setup dirs
@@ -52,7 +53,6 @@ jobs:
               echo "MOTIFINCPATH = /usr/include" >> SConfigISCE
               echo "X11INCPATH = /usr/include" >> SConfigISCE
               echo "RPATH = /opt/conda/lib /usr/lib64 /usr/lib" >> SConfigISCE
-              echo "LINKFLAGS = -L/lib64 -lgfortran" >> SConfigISCE
               cat SConfigISCE
 
       - run:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 252f2f2..7b9c0a8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,14 +50,11 @@ RUN set -ex \
  && ln -s /lib64/libuuid.so.1.3.0 libuuid.so \
  && ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1
 
-# install libgfortran.so.3
+# install libgfortran.so.3 and create missing link
 RUN set -ex \
  && yum install -y gcc-gfortran \
- && cd /opt/conda/lib \
- && unlink libgfortran.so \
- && unlink libgfortran.so.4 \
- && ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so \
- && ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so.4
+ && cd /lib64 \
+ && ( test -f libgfortran.so || ln -sv libgfortran.so.*.* libgfortran.so )
 
 # copy repo
 COPY . /root/isce2
@@ -107,17 +104,14 @@ RUN set -ex \
       hdf5 \
       netcdf4 \
  && sudo yum update -y \
- && sudo yum install -y uuid-devel x11-devel motif-devel \
+ && sudo yum install -y uuid-devel x11-devel motif-devel gcc-gfortran \
  && cd /opt/conda/lib \
  && sudo unlink libuuid.so \
  && sudo unlink libuuid.so.1 \
  && sudo ln -s /lib64/libuuid.so.1.3.0 libuuid.so \
  && sudo ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1 \
- && sudo yum install -y gcc-gfortran \
- && sudo unlink libgfortran.so \
- && sudo unlink libgfortran.so.4 \
- && sudo ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so \
- && sudo ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so.4 \
+ && cd /lib64 \
+ && ( test -f libgfortran.so || sudo ln -sv libgfortran.so.*.* libgfortran.so ) \
  && sudo yum install -y /tmp/isce-2.0-1.x86_64.rpm \
  && sudo yum clean all \
  && sudo rm -rf /var/cache/yum \