diff --git a/playbooks/roles/galaxy/defaults/main.yml b/playbooks/roles/galaxy/defaults/main.yml
index 6082340..ab1026e 100644
--- a/playbooks/roles/galaxy/defaults/main.yml
+++ b/playbooks/roles/galaxy/defaults/main.yml
@@ -1,6 +1,7 @@
-galaxy_chart_version: "1.6.0"
-galaxy_image_tag: "v18.01-pheno-isa_cv1.7.289"
+galaxy_chart_version: "2.0.2"
+galaxy_init_image_tag: "v18.01-pheno-isa_cv1.7.289"
 galaxy_init_image: "container-registry.phenomenal-h2020.eu/phnmnl/galaxy-init-pheno-flavoured"
+galaxy_image_tag: "v18.01-pheno-isa_cv1.7.289"
 galaxy_image: "container-registry.phenomenal-h2020.eu/phnmnl/galaxy-web-k8s"
 galaxy_res_limits_cpu: "2"
 galaxy_res_limits_memory: "2Gi"
@@ -12,4 +13,4 @@ postgres_image_tag: ":9.6.5_for_18.01"
 
 proftpd_image: "container-registry.phenomenal-h2020.eu/phnmnl/galaxy-proftpd"
 proftpd_image_tag: "for_galaxy_v18.01"
-proftpd_port: 44
+#proftpd_port: 44
diff --git a/playbooks/roles/galaxy/templates/galaxy-helm-values.yaml.j2 b/playbooks/roles/galaxy/templates/galaxy-helm-values.yaml.j2
index f7a77ae..7605407 100644
--- a/playbooks/roles/galaxy/templates/galaxy-helm-values.yaml.j2
+++ b/playbooks/roles/galaxy/templates/galaxy-helm-values.yaml.j2
@@ -1,58 +1,54 @@
-# Default values for galaxy-stable.
-# This is a YAML-formatted file.
+
 # Declare variables to be passed into your templates.
-replicaCount: 1
-galaxy:
-  init:
-    image:
-      repository: "{{ galaxy_init_image }}"
-      tag: "{{ galaxy_image_tag }}"
-      pullPolicy: IfNotPresent
-    resources: {}
-  backend:
-    postgres: true
+
+init:
   image:
-    repository: "{{ galaxy_image }}"
-    tag: "{{ galaxy_image_tag }}"
+    repository: "{{ galaxy_init_image }}"
+    tag: "{{ galaxy_init_image_tag }}"
     pullPolicy: IfNotPresent
-# Probably not needed as all on /export
-# tools:
-#    destination: "/export/tools"
-  destinations_default: "k8s"
-  k8s:
-    supp_groups: 0
-    fs_group: 0
-  admin:
-    email: "{{ galaxy_admin_email }}"
-    password: "{{ galaxy_admin_password }}"
-    api_key: "{{ galaxy_api_key }}"
-    username: admin
-    allow_user_creation: "False"
-#  smtp:
-#    server:
-#    username:
-#    password:
-#    email_from:
-#    ssl:
-  ftp:
-    url: "{{ ansible_ssh_host }}:{{ proftpd_port }}"
-  instance_resource_url: "{{ hostname }}.{{ domain }}"
-  internal_port: 80
-  node_port_exposed: 30700
-  create_pvc: false
-  pvc:
-    name: "{{ galaxy_pvc }}"
-    capacity: "15Gi"
-    # subPath:
-# development_folder:
+  force_copy: "__venv__,__config__,__galaxy-central__,__tools__,__welcome__"
+
+image:
+  repository: "{{ galaxy_image }}"
+  tag: "{{ galaxy_image_tag }}"
+  pullPolicy: IfNotPresent
+
+admin:
+  email: "{{ galaxy_admin_email }}"
+  password: "{{ galaxy_admin_password }}"
+  api_key: "{{ galaxy_api_key }}"
+  username: admin
+
+galaxy_conf:
+  brand: "PhenoMeNal"
+  admin_users: "{{ galaxy_admin_email }}"
+  allow_user_creation: "False"
+  allow_user_deletion: "False"
+  cleanup_job: never
+  enable_beta_mulled_containers: true
+  url: "{{ hostname }}.{{ domain }}"
+
+job_conf:
+  runners:
+    enable_local: "true"
+    enable_k8: "true"
+
+k8s:
+  supp_groups: 0
+  fs_group: 0
+
+persistence:
+  enabled: "true"
+  existingClaim: "{{ galaxy_pvc }}"
+
 service:
   type: NodePort
-external_ingress_controller: true
+
 ingress:
-  hostname: "{{ hostname }}"
+  enabled: "true"
+  self_managed: "true"
+  hosts: [ "{{ hostname }}" ]
   domain: "{{ domain }}"
-  enabled: true
-  # Used to create Ingress record (should used with service.type: ClusterIP).
   annotations:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
@@ -61,27 +57,30 @@ ingress:
     # - secretName: chart-example-tls
     #   hosts:
     #     - chart-example.local
+
 resources:
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
   limits:
     cpu: "{{ galaxy_res_limits_cpu }}"
     memory: "{{ galaxy_res_limits_memory }}"
   requests:
     cpu: "{{ galaxy_res_requests_cpu }}"
     memory: "{{ galaxy_res_requests_memory }}"
-postgres_for_galaxy:
-  db_password: "{{ galaxy_admin_password }}"
-  postgres_pvc: "{{ postgres_pvc }}"
-  subpath: "postgres"
-  postgres_image: "{{ postgres_image }}"
-  postgres_image_tag: "{{ postgres_image_tag }}"
+
+postgresql:
+  enabled: "true"
+  image: "{{ postgres_image }}"
+  imageTag: "{{ postgres_image_tag }}"
+  postgresPassword: "{{ galaxy_admin_password }}"
+  persistence:
+    subPath: "postgres"
+
 proftpd:
-  generate_ssh_key: true
   image:
     repository: "{{ proftpd_image }}"
     tag: "{{ proftpd_image_tag }}"
-legacy:
-  pre_k8s_16: false
+  generate_ssh_key: "true"
+  service:
+    type: NodePort
+
+rbac:
+  enabled: true