diff --git a/bitwarden/Chart.yaml b/bitwarden/Chart.yaml
index b497462..062dde9 100644
--- a/bitwarden/Chart.yaml
+++ b/bitwarden/Chart.yaml
@@ -7,6 +7,7 @@ keywords:
 - bitwarden
 - bitwardenrs
 - bitwarden_rs
+- vaultwarden
 - password
 - rust
 maintainers:
@@ -16,4 +17,4 @@ name: bitwarden
 sources:
 - https://github.com/dani-garcia/bitwarden_rs
 type: application
-version: 2.0.4
+version: 2.0.5
diff --git a/bitwarden/values.yaml b/bitwarden/values.yaml
index 2bd8244..ac0d6c8 100644
--- a/bitwarden/values.yaml
+++ b/bitwarden/values.yaml
@@ -1,9 +1,9 @@
-# Default values for bitwardenrs.
+# Default values for vaultwarden.
 
 replicaCount: 1
 
 image:
-  repository: bitwardenrs/server
+  repository: vaultwarden/server
   pullPolicy: IfNotPresent
   tag: "1.21.0"
 
@@ -29,9 +29,9 @@ bitwarden:
       name: ""
       tokenKey: ""
   # External database configuration.
-  # Requires bitwardenrs/server >= 1.17.0 or bitwardenrs/server-{mysql,postgres} images
-  # ref: https://github.com/dani-garcia/bitwarden_rs/wiki/Using-the-MySQL-Backend
-  #      https://github.com/dani-garcia/bitwarden_rs/wiki/Using-the-PostgreSQL-Backend
+  # Requires vaultwarden/server >= 1.17.0 or vaultwarden/server-{mysql,postgres} images
+  # ref: https://github.com/dani-garcia/vaultwarden/wiki/Using-the-MySQL-Backend
+  #      https://github.com/dani-garcia/vaultwarden/wiki/Using-the-PostgreSQL-Backend
   externalDatabase:
     enabled: false
     # Supported values: 'mysql', 'postgresql'.
@@ -53,7 +53,7 @@ bitwarden:
       userKey: ""
       # Special characters in the password value must be escaped with percent encoding.
       passwordKey: ""
-  # Enable SMTP. https://github.com/dani-garcia/bitwarden_rs/wiki/SMTP-configuration
+  # Enable SMTP. https://github.com/dani-garcia/vaultwarden/wiki/SMTP-configuration
   smtp:
     enabled: false
     # SMTP hostname, required if SMTP is enabled
@@ -80,7 +80,7 @@ bitwarden:
       name: ""
       userKey: ""
       passwordKey: ""
-  # Enable Yubikey 2FA: https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-Yubikey-OTP-authentication
+  # Enable Yubikey 2FA: https://github.com/dani-garcia/vaultwarden/wiki/Enabling-Yubikey-OTP-authentication
   yubico:
     enabled: false
     # OTP verification server. Will use the default YubiCloud servers if not specified