diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index a3e99489..96996a08 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ oneapi, gcc14 ]
+        compiler: [ oneapi, gcc14, nvhpc, clang ]
         mpi:      [ mpich ]
         gpu:      [ nogpu ]
         arch:     [ x86_64 ]
diff --git a/build-utils/makefile-templates/container-nvhpc.mk b/build-utils/makefile-templates/container-nvhpc.mk
index e8ad46d3..65944861 100644
--- a/build-utils/makefile-templates/container-nvhpc.mk
+++ b/build-utils/makefile-templates/container-nvhpc.mk
@@ -18,8 +18,9 @@ MAKEFLAGS += --jobs=4
 LDFLAGS :=
 
 FC_AUTO_R8 = -r8
+FC_AUTO_I4 = -i4
 FPPFLAGS := $(shell pkg-config --cflags yaml-0.1)
-FFLAGS = $(FC_AUTO_R8) -Mnofma -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee
+FFLAGS = $(FC_AUTO_R8) -Mnofma $(FC_AUTO_I4) -gopt  -time -Mextend -byteswapio -Mflushz -Kieee
 FFLAGS_DEBUG = -O0 -g  # -Mbounds fails compilation and -KTrap=fp fails run! seems like there is a floating point exception in netcdf_io_mod
 FFLAGS_REPRO = -O1 -tp=x86-64-v3
 
diff --git a/build-utils/makefile-templates/ncar-nvhpc.mk b/build-utils/makefile-templates/ncar-nvhpc.mk
index 027b1305..2851be28 100644
--- a/build-utils/makefile-templates/ncar-nvhpc.mk
+++ b/build-utils/makefile-templates/ncar-nvhpc.mk
@@ -6,7 +6,7 @@
 
 FC = ftn
 CC = cc
-CXX = c++
+CXX = CC
 LD = ftn $(MAIN_PROGRAM)
 
 ############
@@ -19,8 +19,9 @@ MAKEFLAGS += --jobs=8
 LDFLAGS :=
 
 FC_AUTO_R8 = -r8
+FC_AUTO_I4 = -i4
 FPPFLAGS := $(shell pkg-config --cflags yaml-0.1)
-FFLAGS = $(FC_AUTO_R8) -Mnofma -i4 -gopt  -time -Mextend -byteswapio -Mflushz -Kieee -tp=zen3
+FFLAGS = $(FC_AUTO_R8) -Mnofma $(FC_AUTO_I4) -gopt  -time -Mextend -byteswapio -Mflushz -Kieee -tp=zen3
 
 
 CFLAGS = -gopt -time -Mnofma
diff --git a/build-utils/makefile-templates/ubuntu-gnu.mk b/build-utils/makefile-templates/ubuntu-gnu.mk
index f523d421..68ea4aea 100644
--- a/build-utils/makefile-templates/ubuntu-gnu.mk
+++ b/build-utils/makefile-templates/ubuntu-gnu.mk
@@ -20,7 +20,6 @@ FPPFLAGS :=
 
 FC_AUTO_R8 = -fdefault-double-8 -fdefault-real-8
 FFLAGS := -fcray-pointer $(FC_AUTO_R8) -Waliasing -ffree-line-length-none -fno-range-check
-
 FFLAGS_REPRO = -O2 -fbounds-check
 FFLAGS_DEBUG = -O0 -g -W -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow