diff --git a/.github/intel-scripts/ifortvars_linux.sh b/.github/intel-scripts/ifortvars_linux.sh
deleted file mode 100755
index 00ed872..0000000
--- a/.github/intel-scripts/ifortvars_linux.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# SPDX-FileCopyrightText: 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-
-#shellcheck disable=SC2010
-LATEST_VERSION=$(ls -1 /opt/intel/oneapi/compiler/ | grep -v latest | sort | tail -1)
-
-# shellcheck source=/dev/null
-source /opt/intel/oneapi/compiler/"$LATEST_VERSION"/env/vars.sh
-
-cd ./modflow6/distribution/
-python build_nightly.py -fc ifort
-cd ../../
diff --git a/.github/intel-scripts/ifortvars_macos.sh b/.github/intel-scripts/ifortvars_macos.sh
deleted file mode 100755
index 60aafeb..0000000
--- a/.github/intel-scripts/ifortvars_macos.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# SPDX-FileCopyrightText: 2020 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-
-source /opt/intel/oneapi/setvars.sh
-
-cd ./modflow6/distribution/
-python build_nightly.py -fc ifort
-cd ../../
diff --git a/.github/intel-scripts/install_linux.sh b/.github/intel-scripts/install_linux.sh
index ed3da0f..5279447 100755
--- a/.github/intel-scripts/install_linux.sh
+++ b/.github/intel-scripts/install_linux.sh
@@ -13,10 +13,10 @@ chmod +x webimage.sh
 rm -rf webimage.sh
 WEBIMAGE_NAME=$(ls -1 webimage_extracted/)
 if [ -z "$COMPONENTS" ]; then
-  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --log-dir=.
   installer_exit_code=$?
 else
-  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --log-dir=.
   installer_exit_code=$?
 fi
 rm -rf webimage_extracted
diff --git a/.github/intel-scripts/install_macos.sh b/.github/intel-scripts/install_macos.sh
index ac758cc..729080e 100755
--- a/.github/intel-scripts/install_macos.sh
+++ b/.github/intel-scripts/install_macos.sh
@@ -13,7 +13,7 @@ if [ -z "$COMPONENTS" ]; then
   sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --eula=accept --continue-with-optional-error=yes --log-dir=.
   installer_exit_code=$?
 else
-  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --continue-with-optional-error=yes --log-dir=.
+  sudo /Volumes/"$(basename "$URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --log-dir=.
   installer_exit_code=$?
 fi
 hdiutil detach /Volumes/"$(basename "$URL" .dmg)" -quiet
diff --git a/.github/intel-scripts/install_windows.bat b/.github/intel-scripts/install_windows.bat
old mode 100755
new mode 100644
index 52654e8..d3e0a1d
--- a/.github/intel-scripts/install_windows.bat
+++ b/.github/intel-scripts/install_windows.bat
@@ -9,7 +9,7 @@ curl.exe --output webimage.exe --url %URL% --retry 5 --retry-delay 5
 start /b /wait webimage.exe -s -x -f webimage_extracted --log extract.log
 del webimage.exe
 if "%COMPONENTS%"=="" (
-  webimage_extracted\bootstrapper.exe -s --action install --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+  webimage_extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
 ) else (
-  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --continue-with-optional-error=yes -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
-)
+  webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 --log-dir=.
+)
\ No newline at end of file
diff --git a/.github/workflows/nightly-build-intel.yml b/.github/workflows/nightly-build-intel.yml
index f6a4699..e1aa064 100644
--- a/.github/workflows/nightly-build-intel.yml
+++ b/.github/workflows/nightly-build-intel.yml
@@ -39,9 +39,9 @@ jobs:
         shell: bash
 
     env:
-      WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
-      LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
-      MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17398/m_HPCKit_p_2021.1.0.2681_offline.dmg
+      WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18247/w_HPCKit_p_2021.4.0.3340_offline.exe
+      LINUX_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18211/l_HPCKit_p_2021.4.0.3347_offline.sh
+      MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/18242/m_HPCKit_p_2021.4.0.3389_offline.dmg
       WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
       LINUX_FORTRAN_COMPONENTS_WEB: intel.oneapi.lin.ifort-compiler
       MACOS_FORTRAN_COMPONENTS: intel.oneapi.mac.ifort-compiler
@@ -56,7 +56,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: |
-          /opt/intel/oneapi/compiler
+          /opt/intel/oneapi
         key: install-${{ env.LINUX_HPCKIT_URL }}-${{ env.LINUX_FORTRAN_COMPONENTS_WEB }}-compiler-${{ hashFiles('**/.github/intel-scripts/cache_exclude_linux.sh') }}
 
     - name: install ifort on linux
@@ -82,7 +82,7 @@ jobs:
       id: cache-install-windows
       uses: actions/cache@v2
       with:
-        path: C:\Program Files (x86)\Intel\oneAPI\compiler
+        path: C:\Program Files (x86)\Intel\oneAPI
         key: install-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_FORTRAN_COMPONENTS }}-compiler-${{ hashFiles('**/.github/intel-scripts/cache_exclude_windows.sh') }}
 
     - name: install ifort on windows
@@ -145,20 +145,19 @@ jobs:
         print("flopy is installed in:  {}".format(flopypth))
         print("pymake is installed in: {}".format(pymakepth))
 
-    - name: Build and zip applications on linux
-      if: runner.os == 'Linux'
-      run: |
-        .github/intel-scripts/ifortvars_linux.sh
-
-    - name: Build and zip applications on macos
-      if: runner.os == 'macOS'
+    - name: Build and zip applications on linux and MacOS
+      if: runner.os == 'Linux' || runner.os == 'macOS'
       run: |
-        .github/intel-scripts/ifortvars_macos.sh
+        source /opt/intel/oneapi/setvars.sh
+        cd ./modflow6/distribution/
+        python build_nightly.py -fc ifort
+        cd ../../
 
-    - name: Build and zip applications on windows
+    - name: Build and zip applications on Windows
       if: runner.os == 'Windows'
+      shell: cmd
       run: |
-        .github/intel-scripts/ifortvars_windows.bat
+        call ".github/intel-scripts/ifortvars_windows.bat"
 
     - name: Move the build zip file
       run: |
@@ -256,6 +255,14 @@ jobs:
       github.event_name == 'push' || github.event_name == 'schedule'
 
     steps:
+    - name: Delete Older Releases
+      uses: dev-drprasad/delete-older-releases@v0.2.0
+      with:
+        keep_latest: 30
+        delete_tags: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Download a Build Artifact
       uses: actions/download-artifact@v2
       with:
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index da3a1a8..26ae995 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -118,7 +118,7 @@ jobs:
 
 #
 #    Uncomment the code below in the event that the oneAPI approach
-#    needs to be abandoned and we need to return to building MODFLOW 6defaults:
+#    needs to be abandoned and we need to return to building MODFLOW 6
 #    executables with gfortran
 #    jdh - 2/22/2021
 #
diff --git a/README.md b/README.md
index 6bdfaa6..fb9e552 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ Each release also includes a copy of the *'MODFLOW 6 – Description of Input an
 
 Release tags are based on the date (YYYYMMDD) the MODFLOW 6 codes were compiled and the release was made. Previous nightly build releases are retained for 30 days in the event that there are issues with the latest release candidate. 
 
-It may be necessary to have gfortran installed locally in order to use the compiled MODFLOW 6 executables, dynamic-linked libraries, and shared objects available in the operating specific release assets associated with the latest and previous release candidates. Additional information on the version of gfortran used to compile the MODFLOW 6 executables, dynamic-linked libraries, and shared objects is provided with each release.
 
 Nightly Build Issues
 --------------------