diff --git a/artifacts/k8s_galaxy.yml b/artifacts/k8s_galaxy.yml
index 51bab43..4baff05 100644
--- a/artifacts/k8s_galaxy.yml
+++ b/artifacts/k8s_galaxy.yml
@@ -90,22 +90,19 @@
             chdir: /opt/galaxy-helm/galaxy
           environment:
             KUBECONFIG: /etc/kubernetes/admin.conf
-          ignore_errors: true
-          register: helm_install
 
-        - name: Undeploy galaxy app
-          command: helm uninstall --namespace {{ NAMESPACE }} galaxy
-          when: helm_install is failed
-
-        - fail:
-            msg: "Error installing galaxy helm chat"
-          when: helm_install is failed
-
-        - name: Wait a bit for pods to start
+        - name: Wait pods to be ready
           pause:
-            seconds: 120
+            minutes: 3
 
         - name: Delete CreateContainerConfigError pods
           command: kubectl delete pods -n {{ NAMESPACE }} --field-selector="status.phase=Pending"
           register: error_pods
           changed_when: error_pods.stdout_lines | length > 1
+          retries: 5
+          delay: 120
+          until: error_pods.stdout_lines | length > 1
+
+        - fail:
+            msg: "Error waiting for pods to be ready"
+          when: error_pods.stdout_lines | length > 1
diff --git a/templates/k8s_galaxy.yaml b/templates/k8s_galaxy.yaml
index 1d32214..2fc8b98 100644
--- a/templates/k8s_galaxy.yaml
+++ b/templates/k8s_galaxy.yaml
@@ -23,6 +23,15 @@ topology_template:
       description: Administrative users - set this to a comma-separated list of valid Galaxy users (email addresses).
       default: 'admin@admin.com'
 
+    # Restrict some K8s input values
+
+    kube_cri_runtime:
+      type: string
+      description: CRI Runtime to use with Kubernetes
+      default: "docker"
+      constraints:
+        - valid_values: [ docker ]
+
   node_templates:
 
     galaxy: