diff --git a/artifacts/k8s_galaxy.yml b/artifacts/k8s_galaxy.yml
index e0687d8..2ebc6a7 100644
--- a/artifacts/k8s_galaxy.yml
+++ b/artifacts/k8s_galaxy.yml
@@ -8,17 +8,17 @@
       affinity:
         podAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              topologyKey: "kubernetes.io/hostname"
-              labelSelector:
-                matchExpressions:
-                - key: app.kubernetes.io/instance
-                  operator: In
-                  values:
-                  - galaxy
-                  - postgres-operator
-                  - rabbitmq-operator
+            - weight: 100
+              podAffinityTerm:
+                topologyKey: "kubernetes.io/hostname"
+                labelSelector:
+                  matchExpressions:
+                    - key: app.kubernetes.io/instance
+                      operator: In
+                      values:
+                        - galaxy
+                        - postgres-operator
+                        - rabbitmq-operator
     admin_users: "{{ galaxy_admin_users | default('admin@galaxy.com') }}"
     brand: "{{ galaxy_brand | default('IM Deployed Galaxy K8s Cluster') }}"
     max_mem: "{{ galaxy_max_mem | default(0) }}"
@@ -40,7 +40,7 @@
           copy:
             dest: /opt/postgres_values.yaml
             mode: '644'
-            content: "{{ AFFINITY | to_nice_yaml }}"
+            content: "{{ AFFINITY | to_yaml }}"
 
         - name: Add helm repo postgres-operator-charts
           command: helm repo add postgres-operator-charts https://opensource.zalando.com/postgres-operator/charts/postgres-operator
@@ -48,7 +48,7 @@
             KUBECONFIG: /etc/kubernetes/admin.conf
 
         - name: Deploy postgres-operator
-          command:  helm install -n {{ NAMESPACE }} --create-namespace postgres-operator postgres-operator-charts/postgres-operator --version 1.9.0 -f /opt/postgres_values.yaml --wait
+          command: helm install -n {{ NAMESPACE }} --create-namespace postgres-operator postgres-operator-charts/postgres-operator --version 1.9.0 -f /opt/postgres_values.yaml --wait
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf
 
@@ -69,17 +69,17 @@
             mode: '644'
             content: |
               clusterOperator:
-              {{ AFFINITY | to_nice_yaml(indent=2) }}
+                {{ AFFINITY | to_yaml(indent=4) }}
               msgTopologyOperator:
-              {{ AFFINITY | to_nice_yaml(indent=2) }}
+                {{ AFFINITY | to_yaml(indent=4) }}
 
         - name: Add helm repo bitnami
           command: helm repo add bitnami https://charts.bitnami.com/bitnami
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf
 
-        - name: Deploy postgres-operator
-          command:  helm install -n {{ NAMESPACE }} --create-namespace rabbitmq-operator bitnami/rabbitmq-cluster-operator --version 2.6.12 -f /opt/rabbitmq_values.yaml
+        - name: Deploy rabbitmq-operator
+          command: helm install -n {{ NAMESPACE }} --create-namespace rabbitmq-operator bitnami/rabbitmq-cluster-operator --version 2.6.12 -f /opt/rabbitmq_values.yaml
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf
 
@@ -108,9 +108,9 @@
                       name: cvmfs-alien-cache
                 # try to pack all the pods in the same nodes
                 controllerplugin:
-                {{ AFFINITY | to_nice_yaml(indent=2) }}
+                  {{ AFFINITY | to_yaml(indent=4) }}
                 nodeplugin:
-                {{ AFFINITY | to_nice_yaml(indent=2) }}
+                  {{ AFFINITY | to_yaml(indent=4) }}
 
         - name: Add helm repo galaxy
           command: helm repo add galaxy https://raw.githubusercontent.com/CloudVE/helm-charts/master/
@@ -166,7 +166,7 @@
                         {{ 'max_cores: ' ~ max_cores if max_cores | int > 0 else '# no max_cores' }}
                         {{ 'max_mem: ' ~ max_mem if max_mem | int > 0 else '# no max_mem' }}
               # try to pack all the pods in the same nodes
-              {{ AFFINITY | to_nice_yaml(indent=2) }}
+              {{ AFFINITY | to_yaml }}
 
         - name: Add helm repo galaxy
           command: helm repo add galaxy https://raw.githubusercontent.com/CloudVE/helm-charts/master/
@@ -175,8 +175,6 @@
 
         - name: Deploy Galaxy
           command: helm install --create-namespace -n {{ NAMESPACE }} galaxy galaxy/galaxy --timeout 15m -f /opt/galaxy_values.yaml --version 5.9.0
-          args:
-            chdir: /opt/galaxy-helm/galaxy
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf