diff --git a/jabgui/build.gradle.kts b/jabgui/build.gradle.kts
index e18d1137204..2a1e46dab7a 100644
--- a/jabgui/build.gradle.kts
+++ b/jabgui/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
@@ -172,7 +173,32 @@ tasks.named("jlinkZip") {
 }
 
 tasks.register<Delete>("deleteInstallerTemp") {
-    delete(file("${layout.buildDirectory.get()}/installer"))
+    delete(layout.buildDirectory.dir("installer"))
+}
+
+var jpackageResourceDir: String  = ""
+
+if (OperatingSystem.current().isWindows) {
+    jpackageResourceDir = "${layout.buildDirectory.get().asFile}/jpackage-resource-dir"
+
+    tasks.register<Copy>("copyJPackageResourceDir") {
+        from("${projectDir}/buildres/windows") {
+            include("JabRef-post-image.wsf")
+            filter<ReplaceTokens>(mapOf("jabRefRoot" to "$projectDir".replace('\\', '/')))
+        }
+        from("${projectDir}/buildres/windows") {
+            exclude("JabRef-post-image.wsf")
+        }
+        into(jpackageResourceDir)
+    }
+
+    tasks.named("jpackage").configure {
+        dependsOn("copyJPackageResourceDir")
+    }
+} else if (OperatingSystem.current().isLinux) {
+    jpackageResourceDir = "${projectDir}/buildres/linux"
+} else if (OperatingSystem.current().isMacOsX) {
+    jpackageResourceDir = "${projectDir}/buildres/mac"
 }
 
 jlink {
@@ -259,7 +285,7 @@ jlink {
         requires("org.freedesktop.dbus")
         requires("org.jsoup")
         requires("org.slf4j")
-        requires("org.tukaani.xz");
+        requires("org.tukaani.xz")
 
         uses("ai.djl.engine.EngineProvider")
         uses("ai.djl.repository.RepositoryFactory")
@@ -313,7 +339,7 @@ jlink {
                     "--win-menu",
                     "--win-menu-group", "JabRef",
                     "--temp", "${layout.buildDirectory.get()}/installer",
-                    "--resource-dir", "$projectDir/buildres/windows",
+                    "--resource-dir", jpackageResourceDir,
                     "--license-file", "$projectDir/buildres/LICENSE_with_Privacy.md",
                     "--file-associations", "$projectDir/buildres/windows/bibtexAssociations.properties"
                 )
@@ -332,7 +358,7 @@ jlink {
                     "--vendor",  "JabRef",
                     "--app-version", "$version",
                     // "--temp", "$buildDir/installer",
-                    "--resource-dir", "$projectDir/buildres/linux",
+                    "--resource-dir", jpackageResourceDir,
                     "--linux-menu-group", "Office;",
                     "--linux-rpm-license-type", "MIT",
                     // "--license-file", "$projectDir/LICENSE.md",
@@ -359,7 +385,7 @@ jlink {
                     "--mac-package-name", "JabRef",
                     "--app-version", "$version",
                     "--file-associations", "$projectDir/buildres/mac/bibtexAssociations.properties",
-                    "--resource-dir", "$projectDir/buildres/mac"
+                    "--resource-dir", jpackageResourceDir
                 )
             )
         }
diff --git a/jabgui/buildres/windows/JabRef-post-image.wsf b/jabgui/buildres/windows/JabRef-post-image.wsf
new file mode 100644
index 00000000000..762c9412cb6
--- /dev/null
+++ b/jabgui/buildres/windows/JabRef-post-image.wsf
@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<package>
+   <job id="postImage">
+    <script language="jscript">
+     <![CDATA[
+        var fileSystem = new ActiveXObject("Scripting.FileSystemObject");
+
+        // The script is invoked in the "image" folder and not in "config" for some reason
+        // DEBUG Output
+        // var shell = new ActiveXObject("WScript.Shell");
+        // shell.Popup(fileSystem.GetFolder("."));
+        var jabRefRoot = fileSystem.GetFolder('@jabRefRoot@');
+        // jpackage will run a copy of the script from the "config" directory.
+        var installerConfig = fileSystem.GetFile(WScript.ScriptFullName).ParentFolder;
+
+        WScript.Echo("jabRefRoot: " + jabRefRoot)
+        WScript.Echo("installerConfig: " + installerConfig)
+
+        // Copy additional installer resources
+        fileSystem.CopyFile(jabRefRoot + "/buildres/windows/JabRefTopBanner.bmp", installerConfig + "/JabRefTopBanner.bmp");
+
+        var wxsFilePath = installerConfig + "/main.wxs";
+        wxsFile = fileSystem.OpenTextFile(wxsFilePath, 1);
+        var contents = wxsFile.ReadAll();
+        wxsFile.Close();
+
+        // Add registry values for JabRef Browser Extension
+        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabRefBrowserEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-firefox.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-chrome.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Microsoft\\Edge\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[INSTALLDIR]jabref-chrome.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\Extensions\\bifehkofibaamoeaopjglfkddgkijdlh\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://clients2.google.com/service/update2/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Wow6432Node\\Google\\Chrome\\Extensions\\bifehkofibaamoeaopjglfkddgkijdlh\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://clients2.google.com/service/update2/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Microsoft\\Edge\\Extensions\\pgkajmkfgbehiomipedjhoddkejohfna\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://edge.microsoft.com/extensionwebstorebase/v1/crx\" /></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Wow6432Node\\Microsoft\\Edge\\Extensions\\pgkajmkfgbehiomipedjhoddkejohfna\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Name=\"update_url\" Value=\"https://edge.microsoft.com/extensionwebstorebase/v1/crx\" /></RegistryKey></Component></DirectoryRef><Feature Id=\"BrowserExtension\" Level=\"1\"><ComponentRef Id=\"RegistryJabRefBrowserEntries\" /></Feature></Product>");
+
+        // Specify banner
+        contents = contents.replace("</Product>", "<WixVariable Id=\"WixUIBannerBmp\" Value=\"JabRefTopBanner.bmp\" /></Product>");
+        //contents = contents.replace("</Product>", "<WixVariable Id=\"WixUIDialogBmp\" Value=\"\" /></Product>");
+
+         wxsFile = fileSystem.OpenTextFile(wxsFilePath, 2, true);
+         wxsFile.Write(contents);
+         wxsFile.Close();
+     ]]>
+    </script>
+   </job>
+</package>
diff --git a/jabgui/buildres/windows/main.wxs b/jabgui/buildres/windows/main.wxs
deleted file mode 100644
index 5c830545e1f..00000000000
--- a/jabgui/buildres/windows/main.wxs
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?ifdef JpIsSystemWide ?>
-    <?define JpInstallScope="perMachine"?>
-  <?else?>
-    <?define JpInstallScope="perUser"?>
-  <?endif?>
-
-  <?define JpProductLanguage=1033 ?>
-  <?define JpInstallerVersion=200 ?>
-  <?define JpCompressedMsi=yes ?>
-
-  <?include $(var.JpConfigDir)/overrides.wxi ?>
-
-  <?ifdef JpAllowUpgrades ?>
-    <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
-  <?else?>
-    <?define JpUpgradeVersionOnlyDetectUpgrade="yes"?>
-  <?endif?>
-  <?ifdef JpAllowDowngrades ?>
-    <?define JpUpgradeVersionOnlyDetectDowngrade="no"?>
-  <?else?>
-    <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
-  <?endif?>
-
-  <Product
-    Id="$(var.JpProductCode)"
-    Name="$(var.JpAppName)"
-    Language="$(var.JpProductLanguage)"
-    Version="$(var.JpAppVersion)"
-    Manufacturer="$(var.JpAppVendor)"
-    UpgradeCode="$(var.JpProductUpgradeCode)">
-
-    <Package
-      Description="$(var.JpAppDescription)"
-      Manufacturer="$(var.JpAppVendor)"
-      InstallerVersion="$(var.JpInstallerVersion)"
-      Compressed="$(var.JpCompressedMsi)"
-      InstallScope="$(var.JpInstallScope)" Platform="x64"
-    />
-
-    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
-
-    <Upgrade Id="$(var.JpProductUpgradeCode)">
-      <UpgradeVersion
-        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
-        Property="JP_UPGRADABLE_FOUND"
-        Maximum="$(var.JpAppVersion)"
-        MigrateFeatures="yes"
-        IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)" />
-      <UpgradeVersion
-        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
-        Property="JP_DOWNGRADABLE_FOUND"
-        Minimum="$(var.JpAppVersion)"
-        MigrateFeatures="yes"
-        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
-    </Upgrade>
-
-    <?ifndef JpAllowUpgrades ?>
-    <CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
-    <?endif?>
-    <?ifndef JpAllowDowngrades ?>
-    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
-    <?endif?>
-
-    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
-
-    <CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />
-
-    <!-- Standard required root -->
-    <Directory Id="TARGETDIR" Name="SourceDir"/>
-
-    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
-      <ComponentGroupRef Id="Shortcuts"/>
-      <ComponentGroupRef Id="Files"/>
-      <ComponentGroupRef Id="FileAssociations"/>
-    </Feature>
-
-    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
-    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
-    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
-    <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" />
-
-    <?ifdef JpHelpURL ?>
-      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
-    <?endif?>
-
-    <?ifdef JpAboutURL ?>
-      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
-    <?endif?>
-
-    <?ifdef JpUpdateURL ?>
-      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
-    <?endif?>
-
-    <?ifdef JpIcon ?>
-    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
-    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
-    <?endif?>
-
-    <UIRef Id="JpUI"/>
-
-    <InstallExecuteSequence>
-      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
-      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
-      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
-      <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom>
-      <?ifdef JpHelpURL ?>
-        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-      <?ifdef JpAboutURL ?>
-        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-      <?ifdef JpUpdateURL ?>
-        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
-      <?endif?>
-
-      <?ifndef JpAllowUpgrades ?>
-      <Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
-      <?endif?>
-      <?ifndef JpAllowDowngrades ?>
-      <Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
-      <?endif?>
-      <RemoveExistingProducts Before="CostInitialize"/>
-      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
-    </InstallExecuteSequence>
-
-    <InstallUISequence>
-      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
-    </InstallUISequence>
-
-    <!-- added by JabRef -->
-    <DirectoryRef Id="TARGETDIR">
-      <Component Id="RegistryJabRefBrowserEntries" Guid="b6bc55ad-905c-4258-89b1-8b37abbe559c" Win64="yes">
-        <RegistryKey Root="HKMU" Key="SOFTWARE\Mozilla\NativeMessagingHosts\org.jabref.jabref" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Value="[INSTALLDIR]jabref-firefox.json"/>
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Google\Chrome\NativeMessagingHosts\org.jabref.jabref" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Value="[INSTALLDIR]jabref-chrome.json"/>
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Microsoft\Edge\NativeMessagingHosts\org.jabref.jabref" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Value="[INSTALLDIR]jabref-chrome.json"/>
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Google\Chrome\Extensions\bifehkofibaamoeaopjglfkddgkijdlh" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Name="update_url" Value="https://clients2.google.com/service/update2/crx" />
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Wow6432Node\Google\Chrome\Extensions\bifehkofibaamoeaopjglfkddgkijdlh" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Name="update_url" Value="https://clients2.google.com/service/update2/crx" />
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Microsoft\Edge\Extensions\pgkajmkfgbehiomipedjhoddkejohfna" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Name="update_url" Value="https://edge.microsoft.com/extensionwebstorebase/v1/crx" />
-        </RegistryKey>
-        <RegistryKey Root="HKMU" Key="Software\Wow6432Node\Microsoft\Edge\Extensions\pgkajmkfgbehiomipedjhoddkejohfna" Action="createAndRemoveOnUninstall" ForceCreateOnInstall="yes">
-          <RegistryValue Type="string" Name="update_url" Value="https://edge.microsoft.com/extensionwebstorebase/v1/crx" />
-        </RegistryKey>
-      </Component>
-    </DirectoryRef>
-    <Feature Id="BrowserExtension" Level="1">
-      <ComponentRef Id="RegistryJabRefBrowserEntries" />
-    </Feature>
-    <WixVariable Id="WixUIBannerBmp" Value="..\..\..\..\..\buildres\windows\JabRefTopBanner.bmp" />
-  </Product>
-</Wix>