diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ec9ed84..03144b48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ stages:
   - test
   - prod-deployment
   - dev-deployment
+  - release
 
 variables:
   DOCKER_HOST: tcp://docker:2376
@@ -16,6 +17,7 @@ include:
   - local: .gitlab/lint.yml
   - local: .gitlab/docker-build.yml
   - local: .gitlab/windows-build.yml
+  - local: .gitlab/release.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml
   - template: Security/Secret-Detection.gitlab-ci.yml
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
index a82cb3f8..2acf3b1e 100644
--- a/.gitlab/merge_request_templates/Default.md
+++ b/.gitlab/merge_request_templates/Default.md
@@ -27,3 +27,4 @@ This checklist encourages us to confirm any changes have been analyzed to reduce
 * [ ] Have you resolved any lint issues?
 * [ ] Have you assigned a reviewer?
 * [ ] Have you applied correct labels?
+* [ ] Have you updated CHANGELOG.md?
diff --git a/.gitlab/release.yml b/.gitlab/release.yml
new file mode 100644
index 00000000..a54dce02
--- /dev/null
+++ b/.gitlab/release.yml
@@ -0,0 +1,16 @@
+release:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - echo "Running release job for tag $CI_COMMIT_TAG"
+  release:
+    tag_name: $CI_COMMIT_TAG
+    name: Crafty $CI_COMMIT_TAG
+    description: ./CHANGELOG.md
+    assets:
+      links:
+        - name: Windows Package
+          url: "https://gitlab.com/some/repo/-/jobs/$(cat CI_JOB_ID.txt)/artifacts/download"
+          link_type: package
diff --git a/.gitlab/windows-build.yml b/.gitlab/windows-build.yml
index 1487155f..277710f0 100644
--- a/.gitlab/windows-build.yml
+++ b/.gitlab/windows-build.yml
@@ -50,9 +50,11 @@ win-prod-build:
       - .venv/
   rules:
     - if: "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH"
+    - if: $CI_COMMIT_TAG
   environment:
     name: production
   script:
+    - echo "${CI_JOB_ID}" > CI_JOB_ID.txt
     - |
       $ErrorActionPreference = "Stop"
       py -m venv .venv
@@ -79,5 +81,7 @@ win-prod-build:
     paths:
       - app\
       - .\crafty_commander.exe
+      - CI_JOB_ID.txt
+    expire_in: never
     exclude:
       - app\classes\**\*
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..831e44e8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Changelog
+
+## [4.0.2] - 2022/06/16
+
+### New features
+ None
+
+### Bug fixes
+- Fix winreg import pass on non-NT systems ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/344))
+- Make the WebSocket automatically reconnect. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/345))
+- Fix an error when there are no servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/346))
+- Use relative paths for the jarfile and logs ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/347))
+- Flatten all instances of username creation or editing, usernames should be lower case.
+- - ([Merge Request 1](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/342))
+- - ([Merge Request 2](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/351))
+- Add version inheretence & config check ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/353))
+- Fix support log temp file deletion issue/hang ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/354))
+
+## [4.0.1] - 2022/06/15
+
+### New features
+ None
+
+### Bug fixes
+
+- Remove session.lock warning ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/338))
+- Correct Dutch Spacing Issue ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/340))
+- Remove no-else-* pylint exemptions and tidy code. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/342))
+- Make unRAID more readable, and flatten path to lower, to fit standard practice. ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/337))
+- Fix Java Pathing issues on windows ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/343/diffs?commit_id=cda2120579083d447db5dbeb5489822880f4cae7))
+