diff --git a/.drone.yml b/.drone.yml
index 5241373..4e896ee 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,7 +31,7 @@ helm_deploy: &helm_deploy
   skip_tls_verify: true
   helm_repos: srcd-charts=https://src-d.github.io/charts/
   chart: srcd-charts/gitbase-web
-  chart-version: 0.4.0
+  chart-version: 0.5.0
   release: gp
   tiller_ns: kube-system
   wait: true
@@ -64,8 +64,8 @@ pipeline:
     <<: *helm_deploy
     prefix: STG
     secrets: [ STG_API_SERVER, STG_KUBERNETES_TOKEN ]
-    values: gitbaseWeb.image.tag=commit-${DRONE_COMMIT_SHA:0:7},ingress.globalStaticIpName=gitbase-playground-staging,ingress.hostname=gitbase-playground-staging.srcd.run
-    values_files: [.helm-staging.yml]
+    values: gitbaseWeb.image.tag=commit-${DRONE_COMMIT_SHA:0:7}
+    values_files: [ .helm-defaults.yml, .helm-staging.yml]
     when:
       branch: [master]
       event: [push]
diff --git a/.helm-defaults.yml b/.helm-defaults.yml
new file mode 100644
index 0000000..33d3ef2
--- /dev/null
+++ b/.helm-defaults.yml
@@ -0,0 +1,60 @@
+service:
+  type: NodePort
+  port: 8080
+
+bblfshdServer:
+  image:
+    repository: bblfsh/bblfshd
+    tag: v2.10.0
+    pullPolicy: IfNotPresent
+  drivers:
+    install: true
+    languages:
+      python:
+        repository: bblfsh/python-driver
+        tag: v2.4.0
+      cpp:
+        repository: bblfsh/cpp-driver
+        tag: v0.3.0
+      java:
+        repository: bblfsh/java-driver
+        tag: v2.3.0
+      php:
+        repository: bblfsh/php-driver
+        tag: v2.4.0
+      ruby:
+        repository: bblfsh/ruby-driver
+        tag: v2.4.0
+      javascript:
+        repository: bblfsh/javascript-driver
+        tag: v2.3.0
+      bash:
+        repository: bblfsh/bash-driver
+        tag: v2.1.0
+      go:
+        repository: bblfsh/go-driver
+        tag: v2.3.0
+
+gitbaseServer:
+  # commit defaults to HEAD unless given
+  repositories:
+    go-git:
+      url: https://github.com/src-d/go-git.git
+      #commit: v4.4.0
+    gitbase:
+      url: https://github.com/src-d/gitbase.git
+    gitbase-web:
+      url: https://github.com/src-d/gitbase-web.git
+    bblfshd:
+      url: https://github.com/bblfsh/bblfshd.git
+    siva-java:
+      url: https://github.com/src-d/siva-java.git
+  image:
+    repository: srcd/gitbase
+    tag: v0.17.1
+    pullPolicy: IfNotPresent
+  squashEnable: "true"
+  readonly: "true"
+
+nodeSelector:
+  cloud.google.com/gke-nodepool: default-pool
diff --git a/.helm-staging.yml b/.helm-staging.yml
index 33d3ef2..c31ab08 100644
--- a/.helm-staging.yml
+++ b/.helm-staging.yml
@@ -1,60 +1,13 @@
-service:
-  type: NodePort
-  port: 8080
-
-bblfshdServer:
-  image:
-    repository: bblfsh/bblfshd
-    tag: v2.10.0
-    pullPolicy: IfNotPresent
-  drivers:
-    install: true
-    languages:
-      python:
-        repository: bblfsh/python-driver
-        tag: v2.4.0
-      cpp:
-        repository: bblfsh/cpp-driver
-        tag: v0.3.0
-      java:
-        repository: bblfsh/java-driver
-        tag: v2.3.0
-      php:
-        repository: bblfsh/php-driver
-        tag: v2.4.0
-      ruby:
-        repository: bblfsh/ruby-driver
-        tag: v2.4.0
-      javascript:
-        repository: bblfsh/javascript-driver
-        tag: v2.3.0
-      bash:
-        repository: bblfsh/bash-driver
-        tag: v2.1.0
-      go:
-        repository: bblfsh/go-driver
-        tag: v2.3.0
-
-gitbaseServer:
-  # commit defaults to HEAD unless given
-  repositories:
-    go-git:
-      url: https://github.com/src-d/go-git.git
-      #commit: v4.4.0
-    gitbase:
-      url: https://github.com/src-d/gitbase.git
-    gitbase-web:
-      url: https://github.com/src-d/gitbase-web.git
-    bblfshd:
-      url: https://github.com/bblfsh/bblfshd.git
-    siva-java:
-      url: https://github.com/src-d/siva-java.git
-  image:
-    repository: srcd/gitbase
-    tag: v0.17.1
-    pullPolicy: IfNotPresent
-  squashEnable: "true"
-  readonly: "true"
-
-nodeSelector:
-  cloud.google.com/gke-nodepool: default-pool
+ingress:
+    enabled: true
+    annotations:
+      kubernetes.io/ingress.class: gce
+      kubernetes.io/tls-acme: "true"
+      kubernetes.io/ingress.global-static-ip-name: gitbase-playground-staging
+    path: /*
+    hosts:
+      - gitbase-playground-staging.srcd.run
+    tls:
+      - secretName: gitbase-playground-staging-srcd-run-tls
+        hosts:
+          - gitbase-playground-staging.srcd.run