diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 0000000..a3c4183
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,4 @@
+_extends: .github
+# TODO: Fix after the 1.0 release
+version-template: $MAJOR.$MINOR-jenkins-$PATCH
+tag-template: commons-httpclient-$NEXT_PATCH_VERSION
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
new file mode 100644
index 0000000..84ef368
--- /dev/null
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,16 @@
+# Automates creation of Release Drafts using Release Drafter
+# More Info: https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5.11.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}