diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68db07d1..31e70a97 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,8 +15,8 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.x
-    - name: Restore dependencies
+    - name: Restore dependencies ${{ env.VERSION }}
       run: dotnet restore
-    - name: Build ${{ env.VERSION}}
+    - name: Build ${{ env.VERSION }}
       run: dotnet build
 
diff --git a/.gitignore b/.gitignore
index 19689bbd..88228cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ obj
 .idea
 .vs
 *.user
-.\packages\*
\ No newline at end of file
+.\packages\*
+/VERSION.txt
diff --git a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj
index 9705f02b..004ea6af 100644
--- a/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj
+++ b/Wabbajack.App.Wpf/Wabbajack.App.Wpf.csproj
@@ -15,6 +15,7 @@
     <StartupObject></StartupObject>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IncludeSymbolsInSingleFile>true</IncludeSymbolsInSingleFile>
+    <AssemblyName>Wabbajack</AssemblyName>
   </PropertyGroup>
 
     <PropertyGroup>
diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
index 2fa4b8e4..6080a8c4 100644
--- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj
+++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
@@ -4,7 +4,7 @@
         <TargetFramework Condition=" '$(OS)' == 'Windows_NT'">net6.0-windows</TargetFramework>
         <TargetFramework Condition=" '$(OS)' != 'Windows_NT'">net6.0</TargetFramework>
         <Nullable>enable</Nullable>
-        <TargetName>Wabbajack.exe</TargetName>
+        <AssemblyName>Wabbajack</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
         <Folder Include="Models\" />
diff --git a/Wabbajack.Paths.IO/KnownFolders.cs b/Wabbajack.Paths.IO/KnownFolders.cs
index dfe1ad84..cf761741 100644
--- a/Wabbajack.Paths.IO/KnownFolders.cs
+++ b/Wabbajack.Paths.IO/KnownFolders.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 
@@ -6,7 +7,15 @@ namespace Wabbajack.Paths.IO;
 
 public static class KnownFolders
 {
-    public static AbsolutePath EntryPoint => Assembly.GetExecutingAssembly().Location.ToAbsolutePath().Parent;
+    public static AbsolutePath EntryPoint
+    {
+        get
+        {
+            //var v = Process.GetCurrentProcess().ProcessName;
+            //return Assembly.GetExecutingAssembly().Location.ToAbsolutePath().Parent;
+            return Process.GetCurrentProcess().MainModule!.FileName!.ToAbsolutePath().Parent;
+        }
+    }
 
     public static AbsolutePath AppDataLocal =>
         Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData).ToAbsolutePath();
diff --git a/buildall.bat b/buildall.bat
new file mode 100644
index 00000000..23f921d3
--- /dev/null
+++ b/buildall.bat
@@ -0,0 +1,17 @@
+rmdir /q/s c:\tmp\publish-wj\app
+rmdir /q/s c:\tmp\publish-wj\launcher
+
+python scripts\version_extract.py > VERSION.txt
+SET /p VERSION=<VERSION.txt
+mkdir c:\tmp\publish-wj
+
+dotnet clean
+dotnet restore
+dotnet publish Wabbajack.App.Wpf\Wabbajack.App.Wpf.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o c:\tmp\publish-wj\app --self-contained
+dotnet publish Wabbajack.Launcher\Wabbajack.Launcher.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o c:\tmp\publish-wj\launcher /p:PublishedTrimmed=true /p:PublishReadyToRun=true /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained
+dotnet publish c:\oss\Wabbajack\Wabbajack.CLI\Wabbajack.CLI.csproj --runtime win10-x64 --configuration Release /p:Platform=x64 -o c:\tmp\publish-wj\app --self-contained
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com c:\tmp\publish-wj\app\Wabbajack.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com c:\tmp\publish-wj\launcher\Wabbajack.exe
+"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /t http://timestamp.sectigo.com c:\tmp\publish-wj\app\wabbajack-cli.exe
+"c:\Program Files\7-Zip\7z.exe" a c:\tmp\publish-wj\%VERSION%.zip c:\tmp\publish-wj\app\*
+copy c:\tmp\publish-wj\launcher\Wabbajack.exe c:\tmp\publish-wj\Wabbajack.exe
\ No newline at end of file
diff --git a/scripts/version_extract.py b/scripts/version_extract.py
index b13fd255..f3a2519d 100644
--- a/scripts/version_extract.py
+++ b/scripts/version_extract.py
@@ -1,5 +1,7 @@
+import os
 
 for line in open("CHANGELOG.md").readlines():
     if (line.startswith("#### Version")):
         print(line.split(" ")[3])
+        os.environ["VERSION"] = line.split(" ")[3]
         break
\ No newline at end of file