diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2883091fa722faac171304aca2d608c85303781..3b1f3749bfb60b1e78bfb32964ede6725b48efb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
-## Unreleased
+## [0.8.4]
 
 - Allow enforcing 2fa.
+- Add button for admin users to reset 2FA of users. Also improve UX of this and
+  other dangerous operations in the user edit screen.
 - Fix logout to include hydra post-logout.
+- Do not show link to recovery on TOTP form.
+- Fix css of demo sign-up.
+- Upgrade to python 3.12.
 
 ## [0.8.3]
 
diff --git a/deployment/helmchart/CHANGELOG.md b/deployment/helmchart/CHANGELOG.md
index c75b0d57c2de8b282a748beba041d7b60833d76c..cc755bab7d94fb4812f1af0207118cea86c1ae75 100644
--- a/deployment/helmchart/CHANGELOG.md
+++ b/deployment/helmchart/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.8.4]
+
+* Update dashboard to version 0.8.4.
+
 ## [1.8.3]
 
 * Update dashboard to version 0.8.3.
diff --git a/deployment/helmchart/Chart.yaml b/deployment/helmchart/Chart.yaml
index cbcba41620ee75969d379513c6e2bd581915eee1..0aeb62be5e11573d20f25c2cd9a12b906e16e544 100644
--- a/deployment/helmchart/Chart.yaml
+++ b/deployment/helmchart/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   category: Dashboard
 apiVersion: v2
-appVersion: 0.8.3
+appVersion: 0.8.4
 dependencies:
   - name: common
     # https://artifacthub.io/packages/helm/bitnami/common
@@ -23,4 +23,4 @@ name: stackspin-dashboard
 sources:
   - https://open.greenhost.net/stackspin/dashboard/
   - https://open.greenhost.net/stackspin/dashboard-backend/
-version: 1.8.4-integration
+version: 1.8.4
diff --git a/deployment/helmchart/values.yaml b/deployment/helmchart/values.yaml
index bd7979068b77431fce5c07cd110a7174db517ce8..e52f0ed93c4af6d4a0790219a920c556ae702b3d 100644
--- a/deployment/helmchart/values.yaml
+++ b/deployment/helmchart/values.yaml
@@ -68,7 +68,7 @@ dashboard:
   image:
     registry: open.greenhost.net:4567
     repository: stackspin/dashboard/dashboard
-    tag: 177-support-enforcing-2fa
+    tag: 0.8.4
     digest: ""
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
@@ -236,7 +236,7 @@ backend:
   image:
     registry: open.greenhost.net:4567
     repository: stackspin/dashboard/dashboard-backend
-    tag: 177-support-enforcing-2fa
+    tag: 0.8.4
     digest: ""
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
@@ -723,7 +723,7 @@ tests:
   image:
     registry: open.greenhost.net:4567
     repository: stackspin/dashboard/cypress-test
-    tag: 177-support-enforcing-2fa
+    tag: 0.8.4
     pullPolicy: IfNotPresent
   credentials:
     user: ""