diff --git a/Makefile b/Makefile
index 8eb8f0cc9a..473d1c0d2a 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,10 @@ src/github.com/docker/scan-cli-plugin:
 	git init $@
 	git -C $@ remote add origin "$(DOCKER_SCAN_REPO)"
 
+src/github.com/docker/compose:
+	git init $@
+	git -C $@ remote add origin "$(DOCKER_COMPOSE_REPO)"
+
 
 .PHONY: checkout-cli
 checkout-cli: src/github.com/docker/cli
@@ -54,8 +58,12 @@ checkout-docker: src/github.com/docker/docker
 checkout-scan-cli-plugin: src/github.com/docker/scan-cli-plugin
 	./scripts/checkout.sh src/github.com/docker/scan-cli-plugin "$(DOCKER_SCAN_REF)"
 
+.PHONY: checkout-compose
+checkout-compose: src/github.com/docker/compose
+	./scripts/checkout.sh src/github.com/docker/compose "$(DOCKER_COMPOSE_REF)"
+
 .PHONY: checkout
-checkout: checkout-cli checkout-docker checkout-scan-cli-plugin ## checkout source at the given reference(s)
+checkout: checkout-cli checkout-docker checkout-scan-cli-plugin checkout-compose ## checkout source at the given reference(s)
 
 .PHONY: clean
 clean: clean-src ## remove build artifacts
diff --git a/common.mk b/common.mk
index ce1ddd2a67..c1040f8431 100644
--- a/common.mk
+++ b/common.mk
@@ -16,7 +16,7 @@ BUILDTIME=$(shell date -u -d "@$${SOURCE_DATE_EPOCH:-$$(date +%s)}" --rfc-3339 n
 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
 DEFAULT_PRODUCT_LICENSE:=Community Engine
 DOCKER_GITCOMMIT:=abcdefg
-GO_VERSION:=1.16.6
+GO_VERSION:=1.16.7
 PLATFORM=Docker Engine - Community
 SHELL:=/bin/bash
 VERSION?=0.0.1-dev
@@ -26,6 +26,7 @@ VERSION?=0.0.1-dev
 DOCKER_CLI_REPO    ?= https://github.com/docker/cli.git
 DOCKER_ENGINE_REPO ?= https://github.com/docker/docker.git
 DOCKER_SCAN_REPO   ?= https://github.com/docker/scan-cli-plugin.git
+DOCKER_COMPOSE_REPO   ?= https://github.com/docker/compose.git
 
 # REF can be used to specify the same branch or tag to use for *both* the CLI
 # and Engine source code. This can be useful if both the CLI and Engine have a
@@ -37,6 +38,7 @@ REF                ?= HEAD
 DOCKER_CLI_REF     ?= $(REF)
 DOCKER_ENGINE_REF  ?= $(REF)
 DOCKER_SCAN_REF    ?= v0.8.0
+DOCKER_COMPOSE_REF ?= v2.0.0-rc.3
 
 export BUILDTIME
 export DEFAULT_PRODUCT_LICENSE