diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1dd3b143..eda3ac06 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,57 +12,64 @@ on:
 
 jobs:
   build_windows:
-    runs-on: self-hosted
+    runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - name: Checkout source code
+      uses: actions/checkout@v4
+    
+    - name: Install Lazarus
+      uses: red-prig/setup-lazarus@v3
+      with:
+        lazarus-version: "3.6"
+        with-cache: true
 
-      - name: Hash
-        shell: cmd
-        working-directory: ./
-        run: echo '%GITHUB_SHA:~0,7%' > tag.inc
+    - name: Hash
+      shell: cmd
+      working-directory: ./
+      run: echo '%GITHUB_SHA:~0,7%' > tag.inc
 
-      - name: Tag
-        shell: cmd
-        working-directory: ./
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo '%GITHUB_REF_NAME%' > tag.inc
+    - name: Tag
+      shell: cmd
+      working-directory: ./
+      if: startsWith(github.ref, 'refs/tags/')
+      run: echo '%GITHUB_REF_NAME%' > tag.inc
 
-      - name: Compile
-        shell: cmd
-        working-directory: ./
-        run: |
-          lazbuild -B fpPS4.lpi > nul
-          strip fpPS4.exe
+    - name: Compile
+      shell: cmd
+      working-directory: ./
+      run: |
+        lazbuild -B fpPS4.lpi > nul
+        strip fpPS4.exe
 
-      - name: Download
-        shell: cmd
-        working-directory: ./
-        run: |
-          curl -k -L -s https://github.com/red-prig/fpps4-bin/raw/main/ffmpeg.zip -o ffmpeg.zip
-          unzip ffmpeg.zip
+    - name: Download
+      shell: cmd
+      working-directory: ./
+      run: |
+        curl -k -L -s https://github.com/red-prig/fpps4-bin/raw/main/ffmpeg.zip -o ffmpeg.zip
+        unzip ffmpeg.zip
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-        with:
-          name: fpPS4
-          path: |
-            fpPS4.exe
-            *.dll
-          if-no-files-found: warn
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+      with:
+        name: fpPS4
+        path: |
+          fpPS4.exe
+          *.dll
+        if-no-files-found: warn
 
-      - name: Pack
-        shell: cmd
-        working-directory: ./
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          mkdir sce_module
-          echo "Put libSceNgs2.prx and etc. here" > sce_module/info.txt
-          zip -9 -qq -r "fpPS4_%GITHUB_REF_NAME%.zip" "fpPS4.exe" "*.dll" "sce_module/info.txt"
+    - name: Pack
+      shell: cmd
+      working-directory: ./
+      if: startsWith(github.ref, 'refs/tags/')
+      run: |
+        mkdir sce_module
+        echo "Put libSceNgs2.prx and etc. here" > sce_module/info.txt
+        zip -9 -qq -r "fpPS4_%GITHUB_REF_NAME%.zip" "fpPS4.exe" "*.dll" "sce_module/info.txt"
 
-      - name: Release
-        uses: red-prig/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: ./fpPS4_${{ github.ref_name }}.zip
+    - name: Release
+      uses: softprops/action-gh-release@v2
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: ./fpPS4_${{ github.ref_name }}.zip
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index df709e0a..287c5513 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,26 +10,33 @@ on:
 
 jobs:
   build_windows:
-    runs-on: self-hosted
+    runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - name: Checkout source code
+      uses: actions/checkout@v4
+    
+    - name: Install Lazarus
+      uses: red-prig/setup-lazarus@v3
+      with:
+        lazarus-version: "3.6"
+        with-cache: true
 
-      - name: Hash
-        shell: cmd
-        working-directory: ./
-        run: echo '%GITHUB_SHA:~0,7%' > tag.inc
+    - name: Hash
+      shell: cmd
+      working-directory: ./
+      run: echo '%GITHUB_SHA:~0,7%' > tag.inc
 
-      - name: Compile
-        shell: cmd
-        working-directory: ./
-        run: |
-          lazbuild -B fpPS4.lpi > nul
-          strip fpPS4.exe
+    - name: Compile
+      shell: cmd
+      working-directory: ./
+      run: |
+        lazbuild -B fpPS4.lpi > nul
+        strip fpPS4.exe
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: fpPS4
-          path: fpPS4.exe
-          if-no-files-found: warn
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: fpPS4
+        path: fpPS4.exe
+        if-no-files-found: warn