diff --git a/bitwarden/CHANGELOG.md b/bitwarden/CHANGELOG.md
index 94cab3179..7af9e9c7a 100644
--- a/bitwarden/CHANGELOG.md
+++ b/bitwarden/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 1.21.0 (30-04-2021)
+- Update to latest version from dani-garcia/bitwarden_rs
+
 ## 1.20.0
 - Update to latest version from dani-garcia/bitwarden_rs (Implemented Send functionality, Updated web vault to 2.19.0, CORS fixes, Updated diagnostics page with more info, Updated dependencies) 
 
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index ba55920c7..21fdfa9e3 100644
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -3,7 +3,7 @@ ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.0.0
 # Get prebuild containers from Bitwarden RS
 ###############################################################################
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.20.0"
+ARG BUILD_UPSTREAM="1.21.0"
 
 # hadolint ignore=DL3006
 FROM "bitwardenrs/server:${BUILD_UPSTREAM}" as bitwarden
diff --git a/bitwarden/config.json b/bitwarden/config.json
index 0994c7fc5..0a60e4467 100644
--- a/bitwarden/config.json
+++ b/bitwarden/config.json
@@ -1,7 +1,7 @@
 {
   "name": "Bitwarden RS",
-  "version": "1.20.0",
-  "upstream": "1.20.0",
+  "version": "1.21.0",
+  "upstream": "1.21.0",
   "slug": "bitwarden",
   "description": "Open source password management solution",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bitwarden#readme",