diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index fce83bb5f8..fcc50b6f0a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -24,7 +24,7 @@ jobs:
         gcc_v: [9] # Version of GFortran we want to use.
         rust: [stable]
     env:
-      FC: gfortran-${{ matrix.gcc_v }}
+      FC: gfortran
       GCC_V: ${{ matrix.gcc_v }}
 
     steps:
@@ -38,16 +38,10 @@ jobs:
     - name: Install GFortran Linux
       if: contains(matrix.os, 'ubuntu')
       run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get install -y gcc-${GCC_V} gfortran-${GCC_V}
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
         --slave /usr/bingcov gcov /usr/bin/gcov-${GCC_V}
 
-    - name: Install GFortran macOS
-      if: contains(matrix.os, 'macos')
-      run: brew install gcc@${GCC_V} || brew upgrade gcc@${GCC_V} || true
 
     - name: Install Rust
       uses: hecrj/setup-rust-action@v1
diff --git a/src/main.rs b/src/main.rs
index be715988f6..340c1d39f3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,7 @@
 use structopt::StructOpt;
 use toml::Value;
 use std::path::{Path, PathBuf};
+use std::env;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -67,10 +68,14 @@ add_executable(p1 ../main.f90 {})
     };
     args.extend(vec!["-B", "build", "."]);
     println!("[+] cmake {:?}", args);
+    let fc : String = match env::var("FC") {
+        Ok(val) => val,
+        Err(_) => "gfortran".to_string(),
+    };
     let output = std::process::Command::new("cmake")
                            .args(&args)
                            .current_dir(target_dir)
-                           .env("FC", "gfortran")
+                           .env("FC", fc)
                            .output().unwrap();
     println!("status: {}", output.status);
     println!("stdout: {}", String::from_utf8_lossy(&output.stdout));