diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml
index 91829bead5d..d8c3b3873d4 100644
--- a/charts/stable/vaultwarden/Chart.yaml
+++ b/charts/stable/vaultwarden/Chart.yaml
@@ -28,7 +28,7 @@ name: vaultwarden
 sources:
 - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 14.0.16
+version: 14.0.17
 annotations:
   truecharts.org/catagories: |
     - security
diff --git a/charts/stable/vaultwarden/templates/common.yaml b/charts/stable/vaultwarden/templates/common.yaml
index 23381ff8a0c..ae3fa08a44d 100644
--- a/charts/stable/vaultwarden/templates/common.yaml
+++ b/charts/stable/vaultwarden/templates/common.yaml
@@ -10,12 +10,13 @@
 
 {{/* Define path for websocket */}}
 {{- define "vaultwarden.websocket" -}}
+{{- $fullname := include "common.names.fullname" . -}}
 path: "/notifications/hub"
 # -- Ignored if not kubeVersion >= 1.14-0
 pathType: Prefix
 service:
   # -- Overrides the service name reference for this path
-  name: ws
+  name: {{ printf "%s-ws" $fullname }}
   port: {{ .Values.service.ws.ports.ws.port }}
 {{- end -}}