diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index f9dbf548..c7aabf00 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=v1.8.2.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga22"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
index 0416b0d2..124cbdff 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=v1.8.2.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga22"
             "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 a37a7010..cbf582d7 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=v1.8.2.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga22"
           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 a09aa27f..6d6d27a5 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=v1.8.2.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga22"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
index 7c9391c2..16a4d507 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=v1.8.2.giga22"
+            "GIGAHORSE_BRANCH=v2.1.1.giga22"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b3fd5b6..96f91c35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. The format
 ### Changed
 ### Updated
  - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.1.1) to v2.1.1 - misc improvements, see their release notes.
- - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v1.8.2.giga22) to v1.8.2.giga22 with C20 compression support.
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.1.1.giga22) to v2.1.1.giga22 with C20 compression support.
 
 ## [2.1.0] - 2023-10-06
 ### Updated