diff --git a/.github/workflows/build-linux.yaml b/.github/workflows/build-linux.yaml
index 6a492ce6..ae814017 100644
--- a/.github/workflows/build-linux.yaml
+++ b/.github/workflows/build-linux.yaml
@@ -32,15 +32,14 @@ jobs:
       with:
         dotnet-version: 5.0.100
     - name: Initialize tools
-      run: init-tools.sh
-      shell: bash
+      run: bash init-tools.sh
     - name: Install dependencies
-      run: dotnet restore il2c.sln
-#      run: dotnet restore samples/GettingStartedIL2C/GettingStartedIL2C.sln
-#      run: dotnet restore samples/Calculator/Calculator.sln
+      run: |
+        dotnet restore il2c.sln
+#        dotnet restore samples/GettingStartedIL2C/GettingStartedIL2C.sln
+#        dotnet restore samples/Calculator/Calculator.sln
     - name: Build runtime library
-      run: build-runtime.sh $(buildConfiguration)
-      shell: bash
+      run: bash build-runtime.sh $(buildConfiguration)
     - name: Build il2c
       run: dotnet build --configuration $(buildConfiguration) --no-restore -p:BuildIdentifier="$(Build.BuildId)" -p:Platform="Any CPU" il2c.sln
 #    - name: Build GettingStartedIL2C-x86
@@ -52,8 +51,7 @@ jobs:
 #    - name: Build Calculator-x64
 #      run: dotnet build --configuration $(buildConfiguration) --no-restore -p:BuildIdentifier="$(Build.BuildId)" -p:Platform=x64 samples/Calculator/Calculator.sln
     - name: Build Calculator-CMake-mingw32
-      run: build.sh $(buildConfiguration)
-      shell: bash
+      run: bash build.sh $(buildConfiguration)
       working-directory: "samples/Calculator/Calculator.CMake"
     - name: Test il2c
       run: dotnet test --no-restore --verbosity normal --configuration $(buildConfiguration) --no-restore -p:BuildIdentifier="$(Build.BuildId)" -p:Platform=x64 -p:CITest=True "tests/IL2C.Core.Test.Fixture/bin/$(buildConfiguration)/**/IL2C.Core.Test.Fixture.dll"
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
index b2cc748a..b9b9dd2e 100644
--- a/.github/workflows/build-windows.yaml
+++ b/.github/workflows/build-windows.yaml
@@ -35,9 +35,10 @@ jobs:
       run: init-tools.bat
       shell: cmd
     - name: Install dependencies
-      run: dotnet restore il2c.sln
-      run: dotnet restore samples/GettingStartedIL2C/GettingStartedIL2C.sln
-      run: dotnet restore samples/Calculator/Calculator.sln
+      run: |
+        dotnet restore il2c.sln
+        dotnet restore samples/GettingStartedIL2C/GettingStartedIL2C.sln
+        dotnet restore samples/Calculator/Calculator.sln
     - name: Build runtime library
       run: build-runtime.bat $(buildConfiguration)
       shell: cmd