diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 50f9aa0..0c44292 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -16,13 +16,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET 6.0 SDK (for FAKE)
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: 6.0.x
     - name: Setup .NET 8.0 SDK
       uses: actions/setup-dotnet@v2
       with:
@@ -32,4 +25,4 @@ jobs:
     - name: Paket Restore
       run: dotnet paket restore
     - name: Build and Test
-      run: dotnet fake run build.fsx
+      run: dotnet fsi build.fsx
diff --git a/build.cmd b/build.cmd
index 068103a..609bd28 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,4 +1,4 @@
 @echo off
 dotnet tool restore
 dotnet paket restore
-dotnet fake run build.fsx %*
+dotnet fsi build.fsx %*
diff --git a/build.fsx b/build.fsx
index fa0bf58..c9264cd 100644
--- a/build.fsx
+++ b/build.fsx
@@ -1,19 +1,25 @@
-#r @"paket:
-source https://nuget.org/api/v2
-framework net6.0
-nuget FSharp.Core 6.0.0.0
-nuget Fake.Core.Target
-nuget Fake.Core.Process
-nuget Fake.Core.ReleaseNotes
-nuget Fake.IO.FileSystem
-nuget Fake.DotNet.Cli
-nuget Fake.DotNet.MSBuild
-nuget Fake.DotNet.AssemblyInfoFile
-nuget Fake.DotNet.Paket
-nuget Fake.DotNet.FSFormatting
-nuget Fake.Tools.Git
-nuget Fake.Api.GitHub //"
-#load "./.fake/build.fsx/intellisense.fsx"
+#load ".fake/build.fsx/intellisense.fsx"
+
+// Boilerplate - https://github.com/fsprojects/FAKE/issues/2719#issuecomment-1470687052
+System.Environment.GetCommandLineArgs()
+|> Array.skip 2 // skip fsi.exe; build.fsx
+|> Array.toList
+|> Fake.Core.Context.FakeExecutionContext.Create false __SOURCE_FILE__
+|> Fake.Core.Context.RuntimeContext.Fake
+|> Fake.Core.Context.setExecutionContext
+
+// the rest of your original build.fsx content...
+#r "nuget: Fake.Core.Target"
+#r "nuget: Fake.Core.Process"
+#r "nuget: Fake.Core.ReleaseNotes"
+#r "nuget: Fake.IO.FileSystem"
+#r "nuget: Fake.DotNet.Cli"
+#r "nuget: Fake.DotNet.MSBuild"
+#r "nuget: Fake.DotNet.AssemblyInfoFile"
+#r "nuget: Fake.DotNet.Paket"
+#r "nuget: Fake.DotNet.FSFormatting"
+#r "nuget: Fake.Tools.Git"
+#r "nuget: Fake.Api.GitHub"
 
 open Fake
 open Fake.Core.TargetOperators
diff --git a/build.sh b/build.sh
index 2fc8163..89f2355 100755
--- a/build.sh
+++ b/build.sh
@@ -5,5 +5,5 @@ then
 else
   dotnet tool restore
   dotnet paket restore
-  dotnet fake run build.fsx $@
-fi
\ No newline at end of file
+  dotnet fsi build.fsx $@
+fi