diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 7929a0f..e4a709e 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -22,14 +22,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Linux x64
+          # Linux x64 (Native - Special handling)
           - target: x86_64-linux-gnu
             sys: Linux
             proc: x86_64
             cc: gcc
             cxx: g++
             ext: ""
-            sysroot: "/"  # Native sysroot
+            mode: native
           # Linux ARM64
           - target: aarch64-linux-gnu
             sys: Linux
@@ -37,7 +37,8 @@ jobs:
             cc: aarch64-linux-gnu-gcc
             cxx: aarch64-linux-gnu-g++
             ext: ""
-            sysroot: "/usr/aarch64-linux-gnu" # Cross sysroot
+            mode: cross
+            sysroot: /usr/aarch64-linux-gnu
           # Linux RISC-V
           - target: riscv64-linux-gnu
             sys: Linux
@@ -45,7 +46,8 @@ jobs:
             cc: riscv64-linux-gnu-gcc
             cxx: riscv64-linux-gnu-g++
             ext: ""
-            sysroot: "/usr/riscv64-linux-gnu" # Cross sysroot
+            mode: cross
+            sysroot: /usr/riscv64-linux-gnu
           # Windows x64
           - target: x86_64-w64-mingw32
             sys: Windows
@@ -54,7 +56,8 @@ jobs:
             cxx: x86_64-w64-mingw32-g++
             rc: x86_64-w64-mingw32-windres
             ext: ".exe"
-            sysroot: "/usr/x86_64-w64-mingw32" # Cross sysroot
+            mode: cross
+            sysroot: /usr/x86_64-w64-mingw32
 
     steps:
       - name: Fix DNS
@@ -71,14 +74,16 @@ jobs:
           git clone http://oauth2:$GITHUB_TOKEN@git.such.software:3000/${{ github.repository }}.git .
           git submodule update --init --recursive
 
-      # --- FIX 1: Code Patches (Final + ICU + Readline) ---
+      # --- FIX 1: Code Patches (Final + ALL ICU Checks + Readline) ---
       - name: Patch Source Code
         run: |
           echo "Patching src/rest_server.cpp..."
           perl -pi -e 's/struct\s+rest_server::handler_loop\s+final/struct rest_server::handler_loop/g' src/rest_server.cpp
           
-          echo "Patching external/monero/CMakeLists.txt (Killing ICU check)..."
+          echo "Patching external/monero/CMakeLists.txt (Killing ICU checks)..."
+          # Disable both icuio and icuin checks
           perl -pi -e 's/find_library\(ICUIO_LIBRARIES/# find_library(ICUIO_LIBRARIES/g' external/monero/CMakeLists.txt
+          perl -pi -e 's/find_library\(ICUIN_LIBRARIES/# find_library(ICUIN_LIBRARIES/g' external/monero/CMakeLists.txt
 
       - name: Download Static SDK
         run: |
@@ -106,7 +111,7 @@ jobs:
           tar -xf cmake.tar.gz
           echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH
 
-      # --- FIX 2: Toolchain includes SYSROOT (Fixes 'RT' and 'ZLIB' not found) ---
+      # --- FIX 2: Dynamic Toolchain (Native vs Cross) ---
       - name: Generate Toolchain File
         run: |
           cat <<EOF > cross.cmake
@@ -115,18 +120,18 @@ jobs:
           set(CMAKE_C_COMPILER ${{ matrix.cc }})
           set(CMAKE_CXX_COMPILER ${{ matrix.cxx }})
           
-          # LOOK HERE: We add the sysroot so it finds /usr/lib/librt.a etc.
-          set(CMAKE_FIND_ROOT_PATH /opt/wownero-sdk ${{ matrix.sysroot }})
-          
-          # Allow looking in both SDK and System
-          set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-          set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
-          set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
-          set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
-          
           set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
           EOF
           
+          # Only set root path logic for TRUE cross-compilation (not native linux x64)
+          if [ "${{ matrix.mode }}" == "cross" ]; then
+            echo "set(CMAKE_FIND_ROOT_PATH /opt/wownero-sdk ${{ matrix.sysroot }})" >> cross.cmake
+            echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> cross.cmake
+            echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> cross.cmake
+            echo "set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> cross.cmake
+            echo "set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)" >> cross.cmake
+          fi
+          
           if [ "${{ matrix.sys }}" == "Windows" ]; then
             echo "set(CMAKE_RC_COMPILER ${{ matrix.rc }})" >> cross.cmake
           fi
@@ -146,10 +151,8 @@ jobs:
 
           # Linker Flags
           if [ "${{ matrix.sys }}" == "Windows" ]; then
-             # Windows: Static + Allow Duplicates (Boost)
              LINK_FLAGS="-static -Wl,--allow-multiple-definition -L$SDK_DIR/lib"
           else
-             # Linux: Just path
              LINK_FLAGS="-L$SDK_DIR/lib"
           fi
 
@@ -181,7 +184,7 @@ jobs:
         run: |
           mkdir release
           if [ "${{ matrix.sys }}" == "Windows" ]; then
-            zip -j release/wownero-lws-${{ matrix.target }}.zip build/src/wownero-lws-daemon${{ matrix.ext }} build/src/wownero-lws-admin${{ matrix.ext }}
+            zip -j release/wownero-lws-${{ matrix.platform }}.zip build/src/wownero-lws-daemon${{ matrix.ext }} build/src/wownero-lws-admin${{ matrix.ext }}
           else
             tar -czf release/wownero-lws-${{ matrix.target }}.tar.gz -C build/src wownero-lws-daemon${{ matrix.ext }} wownero-lws-admin${{ matrix.ext }}
           fi
@@ -224,6 +227,8 @@ jobs:
       - name: Patch Source Code
         run: |
           perl -pi -e 's/struct\s+rest_server::handler_loop\s+final/struct rest_server::handler_loop/g' src/rest_server.cpp
+          perl -pi -e 's/find_library\(ICUIO_LIBRARIES/# find_library(ICUIO_LIBRARIES/g' external/monero/CMakeLists.txt
+          perl -pi -e 's/find_library\(ICUIN_LIBRARIES/# find_library(ICUIN_LIBRARIES/g' external/monero/CMakeLists.txt
 
       - name: Install CMake Only
         run: brew install cmake
@@ -276,4 +281,18 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: wownero-lws-${{ matrix.platform }}
-          path: release/wownero-lws-${{ matrix.platform }}.zip
\ No newline at end of file
+          path: release/wownero-lws-${{ matrix.platform }}.zip
+
+  release:
+    needs: [build-cross, build-macos]
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
+      - name: Publish Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            wownero-lws-*/wownero-lws-*.tar.gz
+            wownero-lws-*/wownero-lws-*.zip
\ No newline at end of file