diff --git a/.github/workflows/hdfeos5.yml b/.github/workflows/hdfeos5.yml
index e737a891299..7884485f223 100644
--- a/.github/workflows/hdfeos5.yml
+++ b/.github/workflows/hdfeos5.yml
@@ -5,9 +5,9 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop  
+      - develop-  
   pull_request:
-    branches: [ develop ]
+    branches: [ develop- ]
     paths-ignore:
       - '.github/CODEOWNERS'
       - '.github/FUNDING.yml'
diff --git a/.github/workflows/lin-auto-nvhpc-f-sh-p-sf.yml b/.github/workflows/lin-auto-nvhpc-f-sh-p-sf.yml
index 09977e699fd..81f7719e204 100644
--- a/.github/workflows/lin-auto-nvhpc-f-sh-p-sf.yml
+++ b/.github/workflows/lin-auto-nvhpc-f-sh-p-sf.yml
@@ -2,7 +2,7 @@ name: lin auto nvhpc f sh p sf
 
 on:
   push:
-    branches: develop-
+    branches: develop
 
 jobs:
   build:
@@ -17,7 +17,7 @@ jobs:
           curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
           echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
           sudo apt-get update -y
-          sudo apt-get install -y nvhpc-24-3
+          sudo apt-get install -y nvhpc-24-7
       - name: Get Sources
         uses: actions/checkout@v4.1.1
       - name: Test HDF5
@@ -25,14 +25,14 @@ jobs:
           NPROCS: 2
         run: |
           export NVHPCSDK=/opt/nvidia/hpc_sdk
-          export OMPI_CXX=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/compilers/bin/nvc++
-          export OMPI_CC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/compilers/bin/nvc
-          export OMPI_FC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/compilers/bin/nvfortran
-          export LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/compilers/lib
-          export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/compilers/bin:$PATH
+          export OMPI_CXX=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvc++
+          export OMPI_CC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvc
+          export OMPI_FC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin/nvfortran
+          export LD_LIBRARY_PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/lib
+          export PATH=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/openmpi4/bin:/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/compilers/bin:$PATH
           export DESTDIR=/tmp
           ./autogen.sh
-          ./configure CC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/comm_libs/openmpi4/bin/mpicc FC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.3/comm_libs/openmpi4/bin/mpifort FCFLAGS="-fPIC -fortranlibs" --enable-fortran --enable-shared --enable-parallel --enable-subfiling-vfd         
+          ./configure CC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/openmpi4/bin/mpicc FC=/opt/nvidia/hpc_sdk/Linux_x86_64/24.7/comm_libs/openmpi4/bin/mpifort CFLAGS="-fPIC" FCFLAGS="-fPIC -fortranlibs" --enable-fortran --enable-shared --enable-parallel --enable-subfiling-vfd         
           cat config.log
           make -j
           make check -j