diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index 8d46240ffae861..7a4acf5a857a85 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -275,7 +275,7 @@ registry.{{ .Values.hostname }}
 {{- $ := .root -}}
 {{- $gp := .gp -}}
 {{- $comp := .comp -}}
-{{- $comp.version | default $gp.version -}}
+{{- required "please specify the Gitpod version to use in your values.yaml or with the helm flag --set version=x.x.x" ($comp.version | default $gp.version) -}}
 {{- end -}}
 
 {{- define "gitpod.comp.imageRepo" -}}
@@ -329,8 +329,8 @@ storage:
   blobQuota: {{ .remoteStorage.blobQuota | default 0 }}
   minio:
     endpoint: {{ $remoteStorageMinio.endpoint | default (printf "minio.%s" $.Values.hostname) }}
-    accessKey: {{ required "minio access key is required, please add a value to your values.yaml" ($remoteStorageMinio.accessKey | default $minio.accessKey) }}
-    secretKey: {{ required "minio secret key is required, please add a value to your values.yaml" ($remoteStorageMinio.secretKey | default $minio.secretKey) }}
+    accessKey: {{ required "minio access key is required, please add a value to your values.yaml or with the helm flag --set minio.accessKey=xxxxx" ($remoteStorageMinio.accessKey | default $minio.accessKey) }}
+    secretKey: {{ required "minio secret key is required, please add a value to your values.yaml or with the helm flag --set minio.secretKey=xxxxx" ($remoteStorageMinio.secretKey | default $minio.secretKey) }}
     secure: {{ $remoteStorageMinio.secure | default ($minio.enabled | default false) }}
     region: {{ $remoteStorageMinio.region | default "local" }}
     parallelUpload: {{ $remoteStorageMinio.parallelUpload | default "" }}
diff --git a/chart/values.yaml b/chart/values.yaml
index ba087b4e7adfb5..f1d8824d1490aa 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 Gitpod GmbH. All rights reserved.
 # Licensed under the MIT License. See License-MIT.txt in the project root for license information.
 
-version: "0.7.0"
+version: # version of Gitpod will be set by the CI job on publishing to https://charts.gitpod.io/
 
 hostname: localhost
 # ingressModes determines how Gitpod makes workspaces and their ports available. Possible values are: