diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b9a7e780419055d0e384d4d170ed744ca8bb80a..8b089e9e30eb3104c95f944cdc820e919165a27e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,6 +269,7 @@ test:
       - GO_VERSION: !reference [.versions, go_supported]
         TEST_TARGET: test
         USE_MESON: YesPlease
+        BUILD_MODE: [ development, build ]
       - TEST_TARGET:
           [
             test-with-praefect,
diff --git a/Makefile b/Makefile
index 070e88b486f05392d4c5264d76fc6dd31580ca23..1720c24e201a6aea1aaa9927d15578380e8b7dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@
 # directory.
 -include config.mak
 
+# BUILD_MODE defines whether we're building for redistribution ( "build" ) or
+# for development environment "development". Presently "build" mode eliminates
+# dependency on host to have "git" installed and utilizes "git" compiled
+# within this project
+BUILD_MODE ?= development
+
 # Unexport environment variables which have an effect on Git itself.
 # 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
@@ -42,7 +48,11 @@ INSTALL_DEST_DIR := ${DESTDIR}${bindir}
 GIT_PREFIX       ?= ${PREFIX}
 
 # Tools
-GIT                         := $(shell command -v git)
+ifeq ($(BUILD_MODE),build)
+	GIT													:= ${BUILD_DIR}/bin/gitaly-git-v2.50
+else
+	GIT                         := $(shell command -v git)
+endif
 GOIMPORTS                   := ${TOOLS_DIR}/goimports
 GOFUMPT                     := ${TOOLS_DIR}/gofumpt
 GOLANGCI_LINT               := ${TOOLS_DIR}/golangci-lint
@@ -698,6 +708,10 @@ ${DEPENDENCY_DIR}: | ${BUILD_DIR}
 
 # These targets build a full Git distribution with the Makefile...
 ${DEPENDENCY_DIR}/git-distribution/git: ${DEPENDENCY_DIR}/git-distribution/Makefile
+ifeq ($(BUILD_MODE),build)
+	${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}"
+endif
 	${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 +776,24 @@ ${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-2.50/Makefile: GIT_VERSION_REF=${GIT_VERSION_2_50}
+
 ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version
+	@ # In builder mode we don't want to depend on git to build git
+ifeq ($(BUILD_MODE),build)
+	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 -
+else
 	${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
+endif
 ifeq ($(OVERRIDE_GIT_VERSION),)
 	${Q}rm -f "${@D}"/version
 else
@@ -786,6 +811,12 @@ $(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.
+ifeq ($(BUILD_MODE),build)
+	${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}"
+endif
 	${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 $@