diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7326cf2..e1bc9fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,25 @@ publish-artifacts:
         curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file ds4/system.json "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ds4/latest/system.json"
     rules:
         - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: $CI_COMMIT_TAG
+          when: manual
+
+changelog:
+    stage: publish
+    before_script:
+        - yarn install --immutable
+    script:
+        - yarn changelog
+    cache:
+        <<: *global_cache
+    artifacts:
+        paths:
+            - CHANGELOG.md
+        expire_in: 1 week
+    rules:
+        - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: $CI_COMMIT_TAG
+          when: manual
 
 .release-template: &release-template
     stage: release
@@ -123,9 +142,11 @@ release:
         - echo 'release job'
     rules:
         - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
+        - if: $CI_COMMIT_TAG
+          when: manual
     release:
         tag_name: $CI_COMMIT_TAG
-        description: "# Changelog"
+        description: "./CHANGELOG.md"
         assets:
             links:
                 - name: "ds4.zip"