diff --git a/tools/install4j/.gitignore b/tools/install4j/.gitignore
new file mode 100644
index 000000000..935600cae
--- /dev/null
+++ b/tools/install4j/.gitignore
@@ -0,0 +1 @@
+*.install4j~
\ No newline at end of file
diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j
index 30dc8cada..fd1e9adca 100644
--- a/tools/install4j/oie-installer-config.install4j
+++ b/tools/install4j/oie-installer-config.install4j
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="11.0.3" transformSequenceNumber="11">
-  <application name="Open Integration Engine" applicationId="4145-9206-7630-8076" mediaDir="${compiler:installer:mediaRoot}/server/build" shortName="oie" publisher="Open Integration Engine Project" publisherWeb="https://openintegrationengine.com" version="4.5.2" backupOnSave="true" autoSave="true" macVolumeId="88477e584eb462ba" javaMinVersion="17" javaMaxVersion="25">
+<install4j version="11.0.5" transformSequenceNumber="11">
+  <application name="Open Integration Engine" applicationId="4145-9206-7630-8076" mediaDir="${compiler:installer:mediaRoot}server/build" shortName="oie" publisher="Open Integration Engine Project" publisherWeb="https://openintegrationengine.com" version="4.5.2" backupOnSave="true" autoSave="true" macVolumeId="88477e584eb462ba" javaMinVersion="17" javaMaxVersion="25">
     <variables>
-      <variable name="installer:mediaRoot" value="../../../engine" />
+      <variable name="installer:mediaRoot" value="../../" />
     </variables>
-    <jreBundles jdkProviderId="Zulu" release="17/17.0.15">
+    <jreBundles jdkProviderId="Zulu" release="17/17.0.18">
       <modules>
         <defaultModules set="all" />
       </modules>
@@ -15,17 +15,21 @@
       <mountPoint id="24" />
     </mountPoints>
     <entries>
-      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}/server/setup" subDirectory="setup">
+      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}server/setup" subDirectory="setup">
         <exclude>
+          <entry location="oieserver" />
+          <entry location="oieserver.ps1" />
+          <entry location="oieserver.vmoptions" />
+          <entry location="oieservice.vmoptions" />
           <entry location="conf" />
         </exclude>
       </dirEntry>
-      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}/server/setup" overwriteMode="0" uninstallMode="1" overrideOverwriteMode="true" overrideUninstallMode="true">
+      <dirEntry mountPoint="24" file="${compiler:installer:mediaRoot}server/setup" overwriteMode="0" uninstallMode="1" overrideOverwriteMode="true" overrideUninstallMode="true">
         <exclude>
           <entry location="server-lib" />
-          <entry location="webapps" />
-          <entry location="mirth-manager-launcher.jar" />
+          <entry location="oieserver" />
           <entry location="public_html" />
+          <entry location="oieserver.ps1" />
           <entry location="oieserver.vmoptions" />
           <entry location="cli-lib" />
           <entry location="server-launcher-lib" />
@@ -33,7 +37,6 @@
           <entry location="public_api_html" />
           <entry location="docs" />
           <entry location="extensions" />
-          <entry location="manager-lib" />
           <entry location="mirth-cli-launcher.jar" />
           <entry location="logs" />
           <entry location="oieservice.vmoptions" />
@@ -61,7 +64,7 @@
 -Dapple.awt.UIElement=true</content>
       </vmOptionsFile>
       <iconImageFiles>
-        <file path="${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png" />
+        <file path="${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png" />
       </iconImageFiles>
     </launcher>
     <launcher name="Open Integration Engine Server" id="39" excludeFromMenu="true">
@@ -82,7 +85,7 @@
 -Dapple.awt.UIElement=true</content>
       </vmOptionsFile>
       <iconImageFiles>
-        <file path="${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png" />
+        <file path="${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png" />
       </iconImageFiles>
     </launcher>
     <launcher name="oiemanager" id="56" menuName="${compiler:sys.fullName}">
@@ -94,7 +97,7 @@
       </java>
       <vmOptionsFile mode="none" />
       <iconImageFiles>
-        <file path="${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png" />
+        <file path="${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png" />
       </iconImageFiles>
     </launcher>
     <launcher name="oiecommand" id="140" menuName="${compiler:sys.fullName}">
@@ -106,7 +109,7 @@
       </java>
       <vmOptionsFile mode="none" />
       <iconImageFiles>
-        <file path="${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png" />
+        <file path="${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png" />
       </iconImageFiles>
     </launcher>
   </launchers>
@@ -117,7 +120,7 @@
           <property name="customIconImageFiles">
             <add>
               <object class="com.install4j.api.beans.ExternalFile">
-                <string>${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png</string>
+                <string>${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png</string>
               </object>
             </add>
           </property>
@@ -254,7 +257,7 @@ return console.askOkCancel(message, true);
                       <entry>
                         <string>en</string>
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>${compiler:installer:mediaRoot}/server/setup/docs/LICENSE.txt</string>
+                          <string>${compiler:installer:mediaRoot}server/setup/docs/LICENSE.txt</string>
                         </object>
                       </entry>
                     </property>
@@ -316,7 +319,7 @@ return console.askOkCancel(message, true);
                       <entry>
                         <string>en</string>
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>${compiler:installer:mediaRoot}/tools/install4j/readme.html</string>
+                          <string>${compiler:installer:mediaRoot}tools/install4j/readme.html</string>
                         </object>
                       </entry>
                     </property>
@@ -427,6 +430,11 @@ return true;
                   <property name="macosIdentifier" type="string">com.oie.oieservice</property>
                 </serializedBean>
               </action>
+              <action id="171" beanClass="com.install4j.runtime.beans.actions.services.StartServiceAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="launcherId" type="string">25</property>
+                </serializedBean>
+              </action>
             </actions>
             <formComponents>
               <formComponent id="16" beanClass="com.install4j.runtime.beans.formcomponents.ProgressComponent">
@@ -501,6 +509,11 @@ return console.askYesNo(message, true);
           </screen>
           <screen id="27" beanClass="com.install4j.runtime.beans.screens.UninstallationScreen" rollbackBarrierExitCode="0">
             <actions>
+              <action id="172" beanClass="com.install4j.runtime.beans.actions.services.StopServiceAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="launcherId" type="string">25</property>
+                </serializedBean>
+              </action>
               <action id="29" beanClass="com.install4j.runtime.beans.actions.UninstallFilesAction" actionElevationType="elevated" rollbackBarrierExitCode="0" />
             </actions>
             <formComponents>
@@ -836,6 +849,8 @@ return console.askYesNo(message, true);
     </windowsArchive>
   </mediaSets>
   <buildIds buildAll="false">
+    <mediaSet refId="121" />
+    <mediaSet refId="125" />
     <mediaSet refId="136" />
   </buildIds>
 </install4j>
diff --git a/tools/install4j/oie_logo_only_white_background_128x128.png b/tools/install4j/oie_logo_only_white_background_128x128.png
new file mode 100644
index 000000000..02a39c876
Binary files /dev/null and b/tools/install4j/oie_logo_only_white_background_128x128.png differ