diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index befa121f9..6711940f1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,13 +57,42 @@ jobs:
         apt-get -y update
         apt-get -y install nsis
         makensis -VERSION                   
-                        
+                 
     - name: Set up ant
       run: |
         apt-get install -y -qq ant 
+        
+    - name: Set up Wine
+      run: |
+        dpkg --add-architecture i386
+        apt-get update -y -qq
+        apt-get install -y -qq wine
+        wine --version
+        
+    - name: Set up Resource Hacker
+      env:
+        RH_DIR: tools/wine/resourcehacker
+        RH_ZIP: tools/wine/resourcehacker.zip
+        RH_URL: https://www.angusj.com/resourcehacker/resource_hacker.zip
+      run: |              
+        set -euxo pipefail
+        
+        apt-get install -y -qq unzip wget
+        
+        mkdir -p "$(dirname "$RH_ZIP")"
+        mkdir -p "$RH_DIR"
+
+        wget -O -q "$RH_ZIP" "$RH_URL"
+        unzip -o -qq "$RH_ZIP" -d "$RH_DIR"
+            
+    - name: Set up Xvfb
+      run: |
+           apt-get install -y -qq xorg xvfb xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic                                
+            
     - name: Build  
       run: |        
-        export CICD_TEMP=${{ github.workspace }}        
+        export WINEPREFIX=$(pwd)/tools/wine
+        export CICD_TEMP=$(pwd) 
         chmod a+x ./cicd_scripts/*.sh
         ./cicd_scripts/before_install.sh
         ./cicd_scripts/script.sh
diff --git a/build.xml b/build.xml
index c7616a4b5..2ef19784b 100644
--- a/build.xml
+++ b/build.xml
@@ -622,14 +622,20 @@
         </java>        
     </target>
     <target name="-exe-splashscreen-inject-unix" depends="-exe-splashscreen-generate,-load-tools" unless="is_windows">
-        <exec executable="wine" failonerror="true">
+        <copy todir="${reshack.path}" overwrite="true">
+            <file file="build/splash.bmp"/>
+            <file file="${dist.dir}/ffdec.exe"/>
+        </copy>
+        <exec executable="xvfb-run" failonerror="true">
+            <arg value="wine" />
             <arg value="${reshack.path}ResourceHacker.exe"/>
-            <arg value="-open"/><arg value="${dist.dir}/ffdec.exe"/>
-            <arg value="-save"/><arg value="${dist.dir}/ffdec.exe"/>
+            <arg value="-open"/><arg value="${reshack.path}ffdec.exe"/>
+            <arg value="-save"/><arg value="${reshack.path}ffdec.exe"/>
             <arg value="-action"/><arg value="addoverwrite"/>
-            <arg value="-res"/><arg value="build/splash.bmp"/>
+            <arg value="-res"/><arg value="${reshack.path}splash.bmp"/>
             <arg value="-mask"/><arg value="BITMAP,1"/>
         </exec>
+        <copy todir="${dist.dir}" file="${reshack.path}ffdec.exe" overwrite="true"/>
     </target>
 
     <target name="-exe-splashscreen-inject-windows" depends="-exe-splashscreen-generate,-load-tools" if="is_windows">        
@@ -659,18 +665,24 @@
     </target>
     
     <target name="-exe-versioninfo-inject-unix" depends="-exe-versioninfo-generate,-load-tools" unless="is_windows">
-        <exec executable="wine" failonerror="true">
+        <copy todir="${reshack.path}" overwrite="true">
+            <file file="build/versioninfo.rc"/>
+            <file file="${dist.dir}/ffdec.exe"/>
+        </copy>        
+        <exec executable="xvfb-run" failonerror="true">
+            <arg value="wine" />
             <arg value="${reshack.path}ResourceHacker.exe"/>
-            <arg value="-open"/><arg value="build/versioninfo.rc"/>
-            <arg value="-save"/><arg value="build/versioninfo.res"/>
+            <arg value="-open"/><arg value="${reshack.path}versioninfo.rc"/>
+            <arg value="-save"/><arg value="${reshack.path}versioninfo.res"/>
             <arg value="-action"/><arg value="compile"/>
         </exec>
-        <exec executable="wine" failonerror="true">
+        <exec executable="xvfb-run" failonerror="true">
+            <arg value="wine" />
             <arg value="${reshack.path}ResourceHacker.exe"/>
-            <arg value="-open"/><arg value="${dist.dir}/ffdec.exe"/>
-            <arg value="-save"/><arg value="${dist.dir}/ffdec.exe"/>
+            <arg value="-open"/><arg value="${reshack.path}ffdec.exe"/>
+            <arg value="-save"/><arg value="${reshack.path}ffdec.exe"/>
             <arg value="-action"/><arg value="addoverwrite"/>
-            <arg value="-res"/><arg value="build/versioninfo.res"/>
+            <arg value="-res"/><arg value="${reshack.path}versioninfo.res"/>
             <arg value="-mask"/><arg value="Version Info,1"/>
         </exec>
     </target>