diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
deleted file mode 100644
index 01d100b9..00000000
--- a/.github/workflows/linux-build.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Linux Build
-
-on:
-  workflow_call:
-
-jobs:
-  linux-build:
-    runs-on: [self-hosted, linux]
-
-    strategy:
-      fail-fast: false
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: false
-        repository: novusengine/Engine
-
-#    - name: Setup premake
-#      uses: abel0b/setup-premake@v2.4
-#      with:
-#        version: "5.0.0-beta1"
-
-#    - name: Install dependencies
-#      run: |
-#        sudo apt-get update && sudo apt-get install -yq clang libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libvulkan-dev hwloc libhwloc-dev
-#        sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100
-
-#    - name: Install Vulkan SDK
-#      run: |
-#        wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
-#        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list http://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
-#        sudo apt update
-#        sudo apt install vulkan-sdk
-
-    - name: Run Premake
-      run: |
-        export VULKAN_SDK=/usr/include/vulkan
-        premake5 gmake2
-
-    - name: Build
-      run: |
-        cd Build
-        make -j$(nproc) -k
diff --git a/.github/workflows/on-label-linux-build.yml b/.github/workflows/on-label-linux-build.yml
index 44e7a535..27939e65 100644
--- a/.github/workflows/on-label-linux-build.yml
+++ b/.github/workflows/on-label-linux-build.yml
@@ -8,5 +8,6 @@ on:
 jobs:
   call-linux-build:
     if: ${{ github.event.label.name == 'build-linux' }}
-    name: Linux Build
-    uses: ./.github/workflows/linux-build.yml
+    uses: novusengine/Workflows/.github/workflows/linux-build.yml@master
+    with:
+      project: Engine
\ No newline at end of file
diff --git a/.github/workflows/on-label-win-build.yml b/.github/workflows/on-label-win-build.yml
index 9f8c523b..8165a3cc 100644
--- a/.github/workflows/on-label-win-build.yml
+++ b/.github/workflows/on-label-win-build.yml
@@ -8,5 +8,6 @@ on:
 jobs:
   call-windows-build:
     if: ${{ github.event.label.name == 'build-win' }}
-    name: Windows Build
-    uses: ./.github/workflows/win-build.yml
+    uses: novusengine/Workflows/.github/workflows/win-build.yml@master
+    with:
+      project: Engine
\ No newline at end of file
diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 3e8c575f..acc38422 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -5,10 +5,14 @@ on:
   workflow_dispatch:
 
 jobs:
-  call-windows-build:
-    name: Windows Build
-    uses: ./.github/workflows/win-build.yml
+#  call-windows-build:
+#    name: Windows Build
+#    uses: novusengine/Workflows/.github/workflows/win-build.yml@master
+#    with:
+#      project: Engine
 
   call-linux-build:
     name: Linux Build
-    uses: ./.github/workflows/linux-build.yml
+    uses: novusengine/Workflows/.github/workflows/linux-build.yml@master
+    with:
+      project: Engine
\ No newline at end of file
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
deleted file mode 100644
index 9f603104..00000000
--- a/.github/workflows/win-build.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Windows Build
-
-on:
-  workflow_call:
-
-jobs:
-  win-build:
-    runs-on: [self-hosted, windows]
-    
-    strategy:
-      fail-fast: false
-      matrix:
-        build-type: [RelDebug]
-      
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: false
-        repository: novusengine/Engine
-
-    - name: Premake
-      run: |
-        premake5 vs2022
-
-    - name: Build
-      run: |
-        msbuild /m /p:Configuration=${{ matrix.build-type }} Build/Engine.sln