diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 69788dc1df..fa83469094 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,13 +60,12 @@ help us to correct style violations reported here:
 ## Release Process
 
 * Upgrade gems with `scripts/update-gemspec`
-* Bump the version number in `lib/cucumber/version`.
-* Make sure `CHANGELOG.md` is updated with the upcoming version number, and has entries for all fixes.
-
-Now release it
-
-    bundle update
-    bundle exec rake
-    git commit -m "Release X.Y.Z"
-    # Make sure you run gem signin as the cukebot@cucumber.io user before running the following step. Credentials can be found in 1Password
-    rake release
+* Bump the version number in `lib/cucumber/version`
+* Update `CHANGELOG.md` with the upcoming version number and create a new `In Git` section
+* Remove empty sections from `CHANGELOG.md`
+* Now release it:
+
+```
+git commit -m "Release X.Y.Z"
+make release
+```
diff --git a/Makefile b/Makefile
index e14d852497..3c99f32748 100644
--- a/Makefile
+++ b/Makefile
@@ -40,4 +40,22 @@ bin/json-formatter: $(MONOREPO_PATH)/json-formatter/go/dist/cucumber-json-format
 
 clean:
 	rm -rf acceptance/*.json bin/json-formatter
-.PHONY: clean
\ No newline at end of file
+.PHONY: clean
+
+release:
+	[ -d '../secrets' ]  || git clone keybase://team/cucumberbdd/secrets ../secrets
+	git -C ../secrets pull
+	../secrets/update_permissions
+	docker run \
+		--volume "${shell pwd}":/app \
+		--volume "${shell pwd}/../secrets/import-gpg-key.sh":/home/cukebot/import-gpg-key.sh \
+		--volume "${shell pwd}/../secrets/codesigning.key":/home/cukebot/codesigning.key \
+		--volume "${shell pwd}/../secrets/.ssh":/home/cukebot/.ssh \
+		--volume "${shell pwd}/../secrets/.gem":/home/cukebot/.gem \
+		--volume "${HOME}/.gitconfig":/home/cukebot/.gitconfig \
+		--env-file ../secrets/secrets.list \
+		--user 1000 \
+		--rm \
+		-it cucumber/cucumber-build:latest \
+		bundle && bundle exec rake && bundle exec rake release
+.PHONY: release