diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index f6ebba97239..fe150485a81 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -42,17 +42,15 @@ jobs:
     - name: build fds debug
       run: |
         source /opt/intel/oneapi/setvars.sh
-        cd ./Build/impi_intel_linux_db
         export INTEL_IFORT=ifx
-        echo "INTEL_IFORT =" $INTEL_IFORT
+        cd ./Build/impi_intel_linux_db
         sh ./make_fds.sh
         ./fds_impi_intel_linux_db
     - name: build fds release
       run: |
         source /opt/intel/oneapi/setvars.sh
-        cd ./Build/impi_intel_linux
         export INTEL_IFORT=ifx
-        echo "INTEL_IFORT =" $INTEL_IFORT
+        cd ./Build/impi_intel_linux
         sh ./make_fds.sh
         ./fds_impi_intel_linux
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 578e1c56705..8c1651e6449 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -84,13 +84,14 @@ jobs:
     - name: build fds debug
       run: |
         call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt"
-        cd Build\impi_intel_win_db
         set INTEL_IFORT=ifx
+        cd Build\impi_intel_win_db
         call make_fds.bat
         fds_impi_intel_win_db.exe
     - name: build fds release
       run: |
         call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt"
+        set INTEL_IFORT=ifx
         cd Build\impi_intel_win
         call make_fds.bat
         fds_impi_intel_win.exe