diff --git a/ci/config/changelog-generator.yml b/ci/config/changelog-generator.yml
index 3933ed1e44c3..d5df49504a78 100644
--- a/ci/config/changelog-generator.yml
+++ b/ci/config/changelog-generator.yml
@@ -15,3 +15,9 @@ changelog:
       sort: "title"
       labels:
         - "type: dependency-upgrade"
+  issues:
+    ports:
+      - label: "status: forward-port"
+        bodyExpression: 'Forward port of issue #(\d+).*'
+      - label: "status: back-port"
+        bodyExpression: 'Back port of issue #(\d+).*'
diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index 2df097bc2981..394cb11bf532 100755
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -4,7 +4,7 @@ image_resource:
   type: docker-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.4'
+    tag: '0.0.5'
 inputs:
 - name: git-repo
 - name: version