diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index 9d31a8b0..baa4b0b0 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.4.4.giga36"
+            "GIGAHORSE_BRANCH=v2.5.0.giga36"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 79394acb..23ab9383 100644
--- a/.github/workflows/main-chia.yaml
+++ b/.github/workflows/main-chia.yaml
@@ -89,7 +89,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v2.4.4.giga36"
+            "GIGAHORSE_BRANCH=v2.5.0.giga36"
             "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
index a7eba8eb..c843f3ac 100644
--- a/.github/workflows/main-mmx.yaml
+++ b/.github/workflows/main-mmx.yaml
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
             "MMX_BRANCH=v0.10.6"
-            "GIGAHORSE_BRANCH=v2.4.4.giga36"
+            "GIGAHORSE_BRANCH=v2.5.0.giga36"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
index cd32c743..a84951be 100644
--- a/.github/workflows/test-chia.yaml
+++ b/.github/workflows/test-chia.yaml
@@ -89,7 +89,7 @@ jobs:
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.4.4.giga36"
+            "GIGAHORSE_BRANCH=v2.5.0.giga36"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index 79476288..95e18d15 100644
--- a/.github/workflows/test-mmx.yaml
+++ b/.github/workflows/test-mmx.yaml
@@ -46,7 +46,7 @@ jobs:
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
             "MMX_BRANCH=v0.10.6"
-            "GIGAHORSE_BRANCH=v2.4.4.giga36"
+            "GIGAHORSE_BRANCH=v2.5.0.giga36"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76300ba2..34c1eb4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.0] - Unreleased
+## [2.5.0] - 2025-01-05
 ### Added
  - New check to restart a farmer if pooling and no partials have been observed in the last hour.  Thanks @aweigold!
 ### Changed
 ### Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.0) to v2.5.0 - misc improvements, see their release notes.
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.4.4.giga36) to v2.4.4.giga36.  NOTE: Only for AMD64, so ARM64 uses previous version.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.5.0.giga36) to v2.5.0.giga36.  NOTE: Only for AMD64, so ARM64 uses an old version.
 ### Notes
- - Chia X.Y.0 releases have become quite buggy so I'm generally not bothering to release a full Machinaris X.Y.0 to match. 
+ - Chia X.Y.0 releases have become quite buggy, so I am delaying a matching Machinaris release by weeks for additional testing.
 
 ## [2.4.4] - 2024-10-17
 ### Added
diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh
index f31af6a6..b46669ff 100644
--- a/scripts/forks/gigahorse_install.sh
+++ b/scripts/forks/gigahorse_install.sh
@@ -24,7 +24,7 @@ else
         tar -xzf chia-gigahorse-farmer*
     else
         # Max broke ARM64 support in v2.4.4.giga36, have to downgrade to 2.4.1
-        if [[ "${GIGAHORSE_BRANCH}" == "v2.4.4.giga36" ]]; then
+        if [[ "${GIGAHORSE_BRANCH}" == "v2.5.0.giga36" ]]; then
             GIGAHORSE_BRANCH="v2.4.1.giga36"  # old version
             GIGAHORSE_VERSION=${GIGAHORSE_BRANCH#?}
         fi