diff --git a/changelog.md b/changelog.md
index 8a1c301b1b..0c1d296e2d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,6 @@
 # Changelog
 
-## 2.4.0~rc2
-
-* Updated SecureDrop release public key to version with expiry date 2020-07-04 (#6448)
-
-## 2.4.0~rc1
+## 2.4.0
 
 ### Web Applications
 
@@ -17,6 +13,7 @@
 * Gracefully emit errors when configured languages are unavailable (#6406)
 * Fixed broken link to download Tor Browser on Tor2Web interstitial (#6393, #6430)
 * Add locale for Portuguese (Portugal), with the language code `pt_PT` (#6156)
+* Improved 2FA token reuse protection (#6460)
 
 ### Journalist API
 
@@ -25,6 +22,7 @@
 ### Operations
 
 * Disabled fwupd timers to suppress inactionable OSSEC notifications (#6401)
+* Updated SecureDrop release public key to version with expiry date 2020-07-04 (#6448)
 
 ### Development
 
diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
index b41e52168e..68e45bc4f9 100644
--- a/install_files/ansible-base/group_vars/all/securedrop
+++ b/install_files/ansible-base/group_vars/all/securedrop
@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_version: "2.4.0~rc2"
+securedrop_version: "2.4.0"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true
diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
index 30bfdeef40..09e5fa734c 100644
--- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
+++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
@@ -1,14 +1,8 @@
-securedrop-app-code (2.4.0~rc2+focal) focal; urgency=medium
+securedrop-app-code (2.4.0+focal) focal; urgency=medium
 
   * see changelog.md 
 
- -- SecureDrop Team <securedrop@freedom.press>  Tue, 17 May 2022 18:14:19 -0400
-
-securedrop-app-code (2.4.0~rc1+focal) focal; urgency=medium
-
-  * see changelog.md
-
- -- SecureDrop Team <securedrop@freedom.press>  Mon, 09 May 2022 12:19:24 -0400
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 24 May 2022 10:51:56 -0400
 
 securedrop-app-code (2.3.2+focal) focal; urgency=medium
 
diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml
index f1ca713527..895210feca 100644
--- a/molecule/builder-focal/tests/vars.yml
+++ b/molecule/builder-focal/tests/vars.yml
@@ -1,5 +1,5 @@
 ---
-securedrop_version: "2.4.0~rc2"
+securedrop_version: "2.4.0"
 ossec_version: "3.6.0"
 keyring_version: "0.1.6"
 config_version: "0.1.4"
diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver
index f90b1afc08..197c4d5c2d 100644
--- a/molecule/shared/stable.ver
+++ b/molecule/shared/stable.ver
@@ -1 +1 @@
-2.3.2
+2.4.0
diff --git a/securedrop/version.py b/securedrop/version.py
index 04f438baf6..ba9b91332b 100644
--- a/securedrop/version.py
+++ b/securedrop/version.py
@@ -1 +1 @@
-__version__ = '2.4.0~rc2'
+__version__ = '2.4.0'
diff --git a/setup.py b/setup.py
index a9725cbea7..03b8d805bb 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.4.0~rc2",
+    version="2.4.0",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",