diff --git a/charts/bigdata-notebook-workspace/Chart.yaml b/charts/bigdata-notebook-workspace/Chart.yaml
index cb7c674e..e9ada1a8 100644
--- a/charts/bigdata-notebook-workspace/Chart.yaml
+++ b/charts/bigdata-notebook-workspace/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-notebook-workspace
 description: A Helm chart for the Spot Big Data Notebook Workspace
 type: application
-version: 0.0.3
+version: 0.0.4
 appVersion: 4.0.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-notebook-workspace/templates/helpers.tpl b/charts/bigdata-notebook-workspace/templates/helpers.tpl
index 92b98521..159ab0a9 100644
--- a/charts/bigdata-notebook-workspace/templates/helpers.tpl
+++ b/charts/bigdata-notebook-workspace/templates/helpers.tpl
@@ -49,7 +49,7 @@ bigdata.spot.io/creatorUserId: {{ .Values.creatorUserId | quote }}
 Common annotations
 */}}
 {{- define "bigdata-notebook-workspace.annotations" -}}
-bigdata.spot.io/notebookWorkspaceName: {{ .Release.Name }}
+bigdata.spot.io/notebookWorkspaceName: {{ .Values.workspaceName }}
 {{- end }}
 
 {{/*
diff --git a/charts/bigdata-notebook-workspace/values.yaml b/charts/bigdata-notebook-workspace/values.yaml
index 7eec7b14..648f2dc3 100644
--- a/charts/bigdata-notebook-workspace/values.yaml
+++ b/charts/bigdata-notebook-workspace/values.yaml
@@ -4,6 +4,12 @@
 
 replicaCount: 1
 creatorUserId: ""
+workspaceName: ""
+
+server:
+  token: ''
+  ip: '0.0.0.0'
+  allowOrigin: '*'
 
 image:
   repository: jupyter/base-notebook
@@ -17,11 +23,6 @@ imagePullSecrets:
 nameOverride: ""
 fullnameOverride: ""
 
-server:
-  token: ''
-  ip: '0.0.0.0'
-  allowOrigin: '*'
-
 gatewayClient:
   enabled: true
   url: "http://bigdata-notebook-service.spot-system.svc.cluster.local"