diff --git a/Makefile b/Makefile
index 070e88b486f05392d4c5264d76fc6dd31580ca23..9864d2bbc455ca700796da8e598f3c9c80ab163e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,6 @@
 # We need to keep GIT_PREFIX because it's used to determine where our
 # self-built Git should be installed into. It's probably not going to
 # matter much though.
-unexport $(filter-out GIT_PREFIX,$(shell git rev-parse --local-env-vars))
 
 # Call `make V=1` in order to print commands verbosely.
 ifeq ($(V),1)
@@ -42,7 +41,7 @@ INSTALL_DEST_DIR := ${DESTDIR}${bindir}
 GIT_PREFIX       ?= ${PREFIX}
 
 # Tools
-GIT                         := $(shell command -v git)
+GIT													:= ${BUILD_DIR}/bin/gitaly-git-v2.50
 GOIMPORTS                   := ${TOOLS_DIR}/goimports
 GOFUMPT                     := ${TOOLS_DIR}/gofumpt
 GOLANGCI_LINT               := ${TOOLS_DIR}/golangci-lint
@@ -163,7 +162,8 @@ GIT_VERSION_PREV ?= d5518d52b23dc4d7d001b0725c5faab4063a3598
 # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new
 # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets,
 # and add new targets under the "# These targets build specific releases of Git." section.
-GIT_VERSION_2_50 ?= v2.50.1.gl1
+# GIT_VERSION_2_50 ?= v2.50.1.gl1
+GIT_VERSION_2_50 ?= 828736d9bd3aee91ed98ec4024eb09ad25aefceb
 #
 # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the
 # `git --version` command. This affects bundled and non-bundled Git, and can be used whenever
@@ -214,6 +214,11 @@ ifeq ($(origin GIT_BUILD_OPTIONS),undefined)
     GIT_MESON_BUILD_OPTIONS += -Dpython=disabled
     GIT_MESON_BUILD_OPTIONS += -Dtests=false
     GIT_MESON_BUILD_OPTIONS += -Dwrap_mode=nofallback
+    GIT_MESON_BUILD_OPTIONS += -Dc_args="${CFLAGS}"
+    GIT_MESON_BUILD_OPTIONS += -Dcpp_args="${CXXFLAGS}"
+    GIT_MESON_BUILD_OPTIONS += -Dc_link_args="${LDFLAGS}"
+    GIT_MESON_BUILD_OPTIONS += -Dcpp_link_args="${LDFLAGS}"
+
 
     # Use non-collision-detecting SHA1 implementation in non-cryptographic scenarios
     # to improve performance. This is only enabled for Linux platforms.
@@ -698,6 +703,8 @@ ${DEPENDENCY_DIR}: | ${BUILD_DIR}
 
 # These targets build a full Git distribution with the Makefile...
 ${DEPENDENCY_DIR}/git-distribution/git: ${DEPENDENCY_DIR}/git-distribution/Makefile
+	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "${@D}" configure
+	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION bash -c "cd ${@D}; ./configure CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" --prefix=${GIT_PREFIX}"
 	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "$(<D)" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS}
 	${Q}touch $@
 # ... and with Meson.
@@ -762,13 +769,16 @@ ${DEPENDENCY_DIR}/git-filter-repo.version: dependency-version | ${DEPENDENCY_DIR
 # build binaries inside of it, we cannot depend on it directly or we'd
 # otherwise try to rebuild all targets depending on it whenever we build
 # something else. We thus depend on the Makefile instead.
+
+${DEPENDENCY_DIR}/git-master/Makefile: GIT_VERSION_REF=${GIT_VERSION_MASTER}
+${DEPENDENCY_DIR}/git-v2.50/Makefile: GIT_VERSION_REF=${GIT_VERSION_2_50}
+${DEPENDENCY_DIR}/git-distribution/Makefile: GIT_VERSION_REF=${GIT_VERSION_MASTER}
+
 ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version
-	${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}"
-	${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL}
-	${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags
-	${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION}
-	${Q}${GIT} -C "${@D}" reset --hard
-	${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD
+	@ # In builder mode we don't want to depend on git to build git
+	mkdir -p ${@D}
+	${Q}curl -L $(GIT_REPO_URL:.git=)/-/archive/$(GIT_VERSION_REF)/git-$(GIT_VERSION_REF).tar.gz \
+		| tar --strip-components=1 -C ${@D} -xzf -
 ifeq ($(OVERRIDE_GIT_VERSION),)
 	${Q}rm -f "${@D}"/version
 else
@@ -786,6 +796,10 @@ $(patsubst %,${DEPENDENCY_DIR}/git-\%/build/%,${GIT_EXECUTABLES}): ${DEPENDENCY_
 	${Q}touch $@
 
 $(patsubst %,${DEPENDENCY_DIR}/git-\%/%,${GIT_EXECUTABLES}): ${DEPENDENCY_DIR}/git-%/Makefile
+	@ # In builder mode we need better control over build sequence and not rely on
+	@ # automatic defaults.
+	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "${@D}" configure
+	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION bash -c "cd ${@D}; ./configure CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" --prefix=${GIT_PREFIX}"
 	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "${@D}" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} ${GIT_EXECUTABLES}
 	${Q}touch $@