diff --git a/bitwarden/.README.j2 b/bitwarden/.README.j2
index 8793855..24a5657 100644
--- a/bitwarden/.README.j2
+++ b/bitwarden/.README.j2
@@ -1,4 +1,4 @@
-# Home Assistant Community Add-on: Bitwarden RS
+# Home Assistant Community Add-on: Bitwarden (Vaultwarden)
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -19,7 +19,7 @@ The Bitwarden platform offers a variety of client applications including
 a web interface, desktop applications, browser extensions and mobile apps.
 
 This add-on is based upon the lightweight and opensource
-[Bitwarden RS][bitwarden-rs] implementation, allowing you to self-host
+[Vaultwarden][vaultwarden] implementation, allowing you to self-host
 this amazing password manager.
 
 Password theft is a serious problem. The websites and apps that you use are
@@ -68,7 +68,6 @@ If you are more interested in stable releases of our add-ons:
 <https://github.com/hassio-addons/repository>
 
 {% endif %}
-[bitwarden-rs]: https://github.com/dani-garcia/bitwarden_rs
 [discord-shield]: https://img.shields.io/discord/478094546522079232.svg
 [discord]: https://discord.me/hassioaddons
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
@@ -82,4 +81,5 @@ If you are more interested in stable releases of our add-ons:
 [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg
 [release]: {{ repo }}/tree/{{ version }}
 [screenshot]: {{ repo }}/raw/main/images/screenshot.png
+[vaultwarden]: https://github.com/dani-garcia/vaultwarden
 
diff --git a/bitwarden/DOCS.md b/bitwarden/DOCS.md
index 7b7544d..3d0fabe 100644
--- a/bitwarden/DOCS.md
+++ b/bitwarden/DOCS.md
@@ -1,4 +1,4 @@
-# Home Assistant Community Add-on: Bitwarden RS
+# Home Assistant Community Add-on: Bitwarden (Vaultwarden)
 
 Bitwarden is an open-source password manager that can store sensitive
 information such as website credentials in an encrypted vault.
@@ -7,7 +7,7 @@ The Bitwarden platform offers a variety of client applications including
 a web interface, desktop applications, browser extensions and mobile apps.
 
 This add-on is based upon the lightweight and opensource
-[Bitwarden RS][bitwarden-rs] implementation, allowing you to self-host
+[Vaultwarden][vaultwarden] implementation, allowing you to self-host
 this amazing password manager.
 
 Password theft is a serious problem. The websites and apps that you use are
@@ -20,12 +20,12 @@ email, bank, and other important accounts. USE A PASSWORD MANAGER!
 The installation of this add-on is pretty straightforward and not different in
 comparison to installing any other Home Assistant add-on.
 
-1. Search for the "Bitwarden RS" add-on in the Supervisor add-on store and
-   install it.
-1. Start the "Bitwarden RS" add-on.
-1. Check the logs of the "Bitwarden RS" add-on to see if everything went
-   well and to get the admin token/password.
-1. Click the "OPEN WEB UI" button to open Bitwarden RS.
+1. Search for the "Bitwarden (Vaultwarden)" add-on in the Supervisor add-on
+   store and install it.
+1. Start the "Bitwarden (Vaultwarden)" add-on.
+1. Check the logs of the "Bitwarden (Vaultwarden)" add-on to see if everything
+   went well and to get the admin token/password.
+1. Click the "OPEN WEB UI" button to open Vaultwarden.
 1. Add `/admin` to the URL to access the admin panel, e.g.,
    `http://hassio.local:7277/admin`. Log in using the admin token you got
    in step 3.
@@ -165,7 +165,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[bitwarden-rs]: https://github.com/dani-garcia/bitwarden_rs
 [contributors]: https://github.com/hassio-addons/addon-bitwarden/graphs/contributors
 [discord-ha]: https://discord.gg/c5DvZ4e
 [discord]: https://discord.me/hassioaddons
@@ -175,3 +174,4 @@ SOFTWARE.
 [reddit]: https://reddit.com/r/homeassistant
 [releases]: https://github.com/hassio-addons/addon-bitwarden/releases
 [semver]: http://semver.org/spec/v2.0.0.htm
+[vaultwarden]: https://github.com/dani-garcia/vaultwarden
diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile
index f62014c..d43e27a 100755
--- a/bitwarden/Dockerfile
+++ b/bitwarden/Dockerfile
@@ -1,8 +1,8 @@
 ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.0
 ###############################################################################
-# Get prebuild containers from Bitwarden RS
+# Get prebuild containers from Vaultwarden
 ###############################################################################
-FROM "bitwardenrs/server:1.20.0" as bitwarden
+FROM "vaultwarden/server:1.21.0" as vaultwarden
 
 ###############################################################################
 # Build the actual add-on.
@@ -14,9 +14,9 @@ FROM ${BUILD_FROM}
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Get the Bitwarden from official images
-COPY --from=bitwarden /bitwarden_rs /opt/bitwarden_rs
-COPY --from=bitwarden /Rocket.toml /opt/Rocket.toml
-COPY --from=bitwarden /web-vault /opt/web-vault
+COPY --from=vaultwarden /vaultwarden /opt/vaultwarden
+COPY --from=vaultwarden /Rocket.toml /opt/Rocket.toml
+COPY --from=vaultwarden /web-vault /opt/web-vault
 
 # add Nginx
 # hadolint ignore=DL3009
diff --git a/bitwarden/config.json b/bitwarden/config.json
index 55d034c..fb287ad 100755
--- a/bitwarden/config.json
+++ b/bitwarden/config.json
@@ -1,5 +1,5 @@
 {
-  "name": "Bitwarden RS",
+  "name": "Bitwarden (Vaultwarden)",
   "version": "dev",
   "slug": "bitwarden",
   "description": "Open source password management solution",
@@ -12,7 +12,7 @@
     "7277/tcp": 7277
   },
   "ports_description": {
-    "7277/tcp": "Bitwarden Vault"
+    "7277/tcp": "Vaultwarden Web interface"
   },
   "map": ["ssl"],
   "options": {
diff --git a/bitwarden/rootfs/etc/services.d/bitwarden/run b/bitwarden/rootfs/etc/services.d/bitwarden/run
index a4741eb..c0d44c3 100644
--- a/bitwarden/rootfs/etc/services.d/bitwarden/run
+++ b/bitwarden/rootfs/etc/services.d/bitwarden/run
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Bitwarden
-# Runs the Bitwarden RS server
+# Runs the Vaultwarden server
 # ==============================================================================
 declare admin_token
 declare log_level
@@ -76,6 +76,6 @@ export WEBSOCKET_ENABLED=true
 export WEBSOCKET_PORT=8080
 
 # Run the Bitwarden server
-bashio::log.info 'Starting the Bitwarden RS server...'
+bashio::log.info 'Starting the Vaultwarden server...'
 cd /opt || bashio::exit.nok
-exec ./bitwarden_rs
+exec ./vaultwarden
diff --git a/bitwarden/translations/en.yaml b/bitwarden/translations/en.yaml
index 30d0464..3809b5f 100644
--- a/bitwarden/translations/en.yaml
+++ b/bitwarden/translations/en.yaml
@@ -22,7 +22,7 @@ configuration:
     name: Size limit of HTTP requests
     description: >-
       Optionally set the size limit of HTTP requests on the API of
-      Bitwarden RS. This might be needed to support larger imports.
+      Vaultwarden. This might be needed to support larger imports.
       The default is 10485760, which is 10MB.
 network:
   7277/tcp: Web interface