diff --git a/.gitignore b/.gitignore
index 98fe8bed6..79727ebcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ bin/
 mocks/springboot2/.gradle/
 mocks/tmp/*
 !mocks/tmp/.gitkeep
-.DS_Store
\ No newline at end of file
+.DS_Store
+/vendor
diff --git a/Makefile b/Makefile
index 4ff5cbf13..eadf3e122 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ build: clean ## Build package
 
 .PHONY: clean
 clean:
-	rm -rf bin
+	rm -rf bin vendor
 
 .PHONY: check
 check: fmt vet ## Run static code analysis
@@ -40,6 +40,7 @@ vet:
 release: clean download ## Create all release artifacts
 	hack/go-build.sh all
 	hack/go-build.sh configs
+	hack/go-build.sh vendor
 	cd bin && sha256sum -b * >"sha256sums.txt"
 
 .PHONY: dev
diff --git a/hack/go-build.sh b/hack/go-build.sh
index 57a5f0bbe..331b6bcff 100755
--- a/hack/go-build.sh
+++ b/hack/go-build.sh
@@ -44,11 +44,18 @@ build() {
 }
 
 create_config_archives() {
-  [ ! -d bin/ ] && mkdir bin
+  mkdir -p bin
   tar -zcvf "bin/config.tar.gz" -C config .
   tar -zcvf "bin/go.d.plugin-config-${VERSION}.tar.gz" -C config .
 }
 
+create_vendor_archives() {
+  mkdir -p bin
+  go mod vendor
+  tar -zc --transform "s:^:go.d.plugin-${VERSION#v}/:" -f "bin/vendor.tar.gz" vendor
+  tar -zc --transform "s:^:go.d.plugin-${VERSION#v}/:" -f "bin/go.d.plugin-vendor-${VERSION}.tar.gz" vendor
+}
+
 build_all_platforms() {
   for PLATFORM in "${PLATFORMS[@]}"; do
     GOOS=$(getos "$PLATFORM")
@@ -85,6 +92,12 @@ if [[ "$WHICH" == "configs" ]]; then
   exit 0
 fi
 
+if [[ "$WHICH" == "vendor" ]]; then
+  echo "Creating vendor archives for version: $VERSION"
+  create_vendor_archives
+  exit 0
+fi
+
 echo "Building binaries for version: $VERSION"
 
 if [[ "$WHICH" == "all" ]]; then