diff --git a/.github/workflows/main.yml b/.github/workflows/Nixpkgs-GHC-Linux.yml
similarity index 90%
rename from .github/workflows/main.yml
rename to .github/workflows/Nixpkgs-GHC-Linux.yml
index 116d5324..30974ee8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/Nixpkgs-GHC-Linux.yml
@@ -1,4 +1,4 @@
-name: "Nixpkgs, Linux"
+name: "Nixpkgs, GHC, Linux"
 on:
   # On Git changes in PR
   pull_request:
@@ -50,6 +50,8 @@ env:
   executableNamesToShellComplete: '[ "replaceWithExecutableName" ]'
 
 jobs:
+
+  # Basic example
   build10:
     name: "Nixpkgs-unstable channel, default GHC (8.8.3)"
     runs-on: ubuntu-latest
@@ -63,12 +65,23 @@ jobs:
       uses: cachix/install-nix-action@v10
     - name: Determined nix-build
       run: ./build.sh
+
+
+  # Example of customization using Nixpkgs Haskell Lib API
   build20:
-    name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)"
+    name: "Release-quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1, Nix shell"
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
-      buildStrictly: "true"
+      compiler: "ghc8101"
+      buildFromSdist: "true"
+      linkWithGold: "true"
+      doHaddock: "true"
+      doHyperlinkSource: "true"
+      doBenchmark: "true"
+      disableOptimization: "false"
+      enableDeadCodeElimination: "true"
+      generateOptparseApplicativeCompletions: "false"
     steps:
     - name: Git checkout
       uses: actions/checkout@v2
@@ -76,12 +89,16 @@ jobs:
       uses: cachix/install-nix-action@v10
     - name: Determined nix-build
       run: ./build.sh
+    - name: Test Nix-shell
+      run: nix-shell --command 'echo Succesfully evaluated, loaded and entered $IN_NIX_SHELL Nix shell env.'
+
+  # Other samples of tests used in the project
   build30:
-    name: "NixOS 20.03 stable channel, default GHC (8.8.3)"
+    name: "NixOS-unstable channel, Strict build, default GHC (8.8.3)"
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
-      rev: "nixos-20.03"
+      buildStrictly: "true"
     steps:
     - name: Git checkout
       uses: actions/checkout@v2
@@ -90,19 +107,11 @@ jobs:
     - name: Determined nix-build
       run: ./build.sh
   build40:
-    name: "Quality test, SDist, Optimization, Benchmark, Haddock, GHC 8.10.1"
+    name: "NixOS 20.03 stable channel, default GHC (8.8.3)"
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
-      compiler: "ghc8101"
-      buildFromSdist: "true"
-      linkWithGold: "true"
-      doHaddock: "true"
-      doHyperlinkSource: "true"
-      doBenchmark: "true"
-      disableOptimization: "false"
-      enableDeadCodeElimination: "true"
-      generateOptparseApplicativeCompletions: "false"
+      rev: "nixos-20.03"
     steps:
     - name: Git checkout
       uses: actions/checkout@v2