diff --git a/Makefile b/Makefile
index 651654c584..67789dd6a1 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,7 @@ build-cli: build-cli-linux-amd build-cli-linux-arm build-cli-mac-intel build-cli
 docs-and-schema: ## Generate the Zarf Documentation and Schema
 	ZARF_CONFIG=hack/empty-config.toml go run main.go internal gen-cli-docs
 	hack/schema/create-zarf-schema.sh
+	hack/cots/update-gitea.sh
 
 init-package-with-agent: build build-local-agent-image init-package
 
diff --git a/hack/cots/update-gitea.sh b/hack/cots/update-gitea.sh
new file mode 100755
index 0000000000..ae537d7256
--- /dev/null
+++ b/hack/cots/update-gitea.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+REPO_ROOT_DIR=$(builtin cd "$SCRIPT_DIR"/../.. && pwd)
+
+TEST_GO_FILE="$REPO_ROOT_DIR/src/test/e2e/06_create_sbom_test.go"
+echo "::debug::TEST_GO_FILE='$TEST_GO_FILE'"
+
+GITEA_IMAGE=$(yq -oy '.package.create.set.gitea_image' $REPO_ROOT_DIR/zarf-config.toml | sed 's!/!_!g; s!:!_!g')
+echo "::debug::GITEA_IMAGE='$GITEA_IMAGE'"
+
+SED_REPLACE=$(printf 's!ghcr.io_go-gitea_gitea_[0-9\.]+-rootless!%s!g' "$GITEA_IMAGE")
+echo "::debug::SED_REPLACE='$SED_REPLACE'"
+
+sed -i -E "$SED_REPLACE" -- $TEST_GO_FILE
diff --git a/packages/gitea/gitea-values.yaml b/packages/gitea/gitea-values.yaml
index 3a52158e51..a156a41671 100644
--- a/packages/gitea/gitea-values.yaml
+++ b/packages/gitea/gitea-values.yaml
@@ -54,5 +54,8 @@ postgresql-ha:
 redis-cluster:
   enabled: false
 
+valkey-cluster:
+  enabled: false
+
 strategy:
   type: "Recreate"
diff --git a/packages/gitea/zarf.yaml b/packages/gitea/zarf.yaml
index 82d5717fea..d1095a93a5 100644
--- a/packages/gitea/zarf.yaml
+++ b/packages/gitea/zarf.yaml
@@ -58,8 +58,8 @@ components:
     charts:
       - name: gitea
         releaseName: zarf-gitea
-        url: https://dl.gitea.io/charts
-        version: 10.1.1
+        url: oci://registry-1.docker.io/giteacharts/gitea
+        version: 12.1.2
         namespace: zarf
         valuesFiles:
           - gitea-values.yaml
diff --git a/src/test/e2e/06_create_sbom_test.go b/src/test/e2e/06_create_sbom_test.go
index dc2b066381..c280f8341a 100644
--- a/src/test/e2e/06_create_sbom_test.go
+++ b/src/test/e2e/06_create_sbom_test.go
@@ -69,8 +69,8 @@ func TestCreateSBOM(t *testing.T) {
 
 	// Test that we preserve the filepath
 	require.FileExists(t, filepath.Join(outSbomPath, "dos-games", "sbom-viewer-ghcr.io_zarf-dev_doom-game_0.0.1.html"))
-	require.FileExists(t, filepath.Join(outSbomPath, "init", "sbom-viewer-docker.io_gitea_gitea_1.21.5-rootless.html"))
-	require.FileExists(t, filepath.Join(outSbomPath, "init", "docker.io_gitea_gitea_1.21.5-rootless.json"))
+	require.FileExists(t, filepath.Join(outSbomPath, "init", "sbom-viewer-ghcr.io_go-gitea_gitea_1.24.3-rootless.html"))
+	require.FileExists(t, filepath.Join(outSbomPath, "init", "ghcr.io_go-gitea_gitea_1.24.3-rootless.json"))
 	require.FileExists(t, filepath.Join(outSbomPath, "init", "sbom-viewer-zarf-component-k3s.html"))
 	require.FileExists(t, filepath.Join(outSbomPath, "init", "zarf-component-k3s.json"))
 	require.FileExists(t, filepath.Join(outSbomPath, "init", "compare.html"))
diff --git a/zarf-config.toml b/zarf-config.toml
index 2b326fe48a..557587e44a 100644
--- a/zarf-config.toml
+++ b/zarf-config.toml
@@ -16,4 +16,4 @@ registry_image = 'library/registry'
 registry_image_tag = '3.0.0'
 
 # The image reference to use for the optional git-server Zarf deploys
-gitea_image = 'gitea/gitea:1.21.5-rootless'
+gitea_image = 'ghcr.io/go-gitea/gitea:1.24.3-rootless'