diff --git a/.github/workflows/github_autotools_intel.yml b/.github/workflows/github_autotools_intel.yml
index 372af083dc..46c36e81d9 100644
--- a/.github/workflows/github_autotools_intel.yml
+++ b/.github/workflows/github_autotools_intel.yml
@@ -12,17 +12,17 @@ jobs:
       matrix:
         io-flag: ["--disable-deprecated-io", "--enable-deprecated-io"]
     container:
-      image: intel/oneapi-hpckit:2023.1.0-devel-ubuntu20.04
+      image: intel/hpckit:2023.2.1-devel-ubuntu22.04
       env:
         CC: mpiicc
         FC: mpiifort
         CFLAGS:  "-I/libs/include"
-        FCFLAGS: "-I/libs/include -g -traceback"
+        FCFLAGS: "-I/libs/include"
         LDFLAGS: "-L/libs/lib"
         TEST_VERBOSE: 1
+        DEBUG_CFLAGS: "-O0 -g -ftrapuv -sox -traceback"
+        DEBUG_FCFLAGS: "-O0 -g -traceback -check -check nouninit -check noarg_temp_created -check nopointer -warn -warn noerrors -fpe0 -ftrapuv"
         I_MPI_FABRICS: "shm" # needed for mpi in image
-        # intel bug causes some failures with shm option(required in container)
-        SKIP_TESTS: "test_mpp_update_domains.1 test_update_domains_performance.1 test_diag_manager2.23"
     steps:
     - name: Cache dependencies
       id: cache
@@ -31,23 +31,28 @@ jobs:
         path: /libs
         key: ${{ runner.os }}-intel-libs
     - name: Install packages for building
-      run: apt-get update && apt-get install -y autoconf libtool automake zlibc zlib1g-dev
+      run: apt-get update && apt-get install -y autoconf libtool automake zlib1g-dev
     - if: steps.cache.outputs.cache-hit != 'true'
-      name: Build netcdf
+      name: Build dependencies
       run: |
         mkdir /libs
-        wget https://hdf-wordpress-1.s3.amazonaws.com/wp-content/uploads/manual/HDF5/HDF5_1_12_2/source/hdf5-1.12.2.tar.gz
-        tar xf hdf5-1.12.2.tar.gz && cd hdf5-1.12.2
+        export LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH"
+        # hdf5
+        wget https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_5/downloads/hdf5-1.14.5.tar.gz
+        tar xf hdf5-1.14.5.tar.gz && cd hdf5-1.14.5
         ./configure --prefix=/libs
         make -j install && cd ..
-        wget https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.8.1.tar.gz
-        tar xf v4.8.1.tar.gz && cd netcdf-c-4.8.1
-        ./configure --prefix=/libs --enable-remote-fortran-bootstrap
+        # netcdf-c
+        wget https://github.com/Unidata/netcdf-c/archive/refs/tags/v4.9.2.tar.gz
+        tar xf v4.9.2.tar.gz && cd netcdf-c-4.9.2
+        ./configure --prefix=/libs --disable-libxml2 --disable-byterange
         make -j install
-        # sets this here to pass embeded configure checks
-        export LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH"
-        make -j -k build-netcdf-fortran
-        make -j install-netcdf-fortran
+        # netcdf-fortran
+        wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.1.tar.gz
+        tar xf v4.6.1.tar.gz && cd netcdf-fortran-4.6.1
+        ./configure --prefix=/libs 
+        make -j install
+        # libyaml
         wget https://github.com/yaml/libyaml/releases/download/0.2.5/yaml-0.2.5.tar.gz
         tar xf yaml-0.2.5.tar.gz && cd yaml-0.2.5
         ./configure --prefix=/libs
@@ -62,4 +67,4 @@ jobs:
     - name: Compile
       run: make -j || make
     - name: Run test suite
-      run: make check LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH" TEST_VERBOSE=1
+      run: make check -k LD_LIBRARY_PATH="/libs/lib:$LD_LIBRARY_PATH" TEST_VERBOSE=1
diff --git a/test_fms/astronomy/test_astronomy.F90 b/test_fms/astronomy/test_astronomy.F90
index 0b94a7f976..d372f83f61 100644
--- a/test_fms/astronomy/test_astronomy.F90
+++ b/test_fms/astronomy/test_astronomy.F90
@@ -270,9 +270,10 @@ subroutine check_answers( results, answers, whoami )
 
     implicit none
     real(TEST_AST_KIND_) :: answers, results
+    integer, parameter   :: lkind = TEST_AST_KIND_
     character(*) :: whoami
 
-    if (results.ne.answers) then
+    if (ABS(results-answers) .gt. 1.0e-5_lkind ) then
        write(*,*) 'EXPECTED ', answers, ' but computed ', results
        call mpp_error(FATAL, trim(whoami))
     end if