diff --git a/ansible/roles/rancher-image-prepull/tasks/main.yml b/ansible/roles/rancher-image-prepull/tasks/main.yml
index 7ee4d25..3f9ee9e 100644
--- a/ansible/roles/rancher-image-prepull/tasks/main.yml
+++ b/ansible/roles/rancher-image-prepull/tasks/main.yml
@@ -7,3 +7,4 @@
   until: rancher_image_pull.rc == 0
   loop: "{{ rancher_images_to_prepull }}"
   changed_when: true
+  failed_when: false
diff --git a/infrastructure/addons/rancher/helmrelease-rancher.yaml b/infrastructure/addons/rancher/helmrelease-rancher.yaml
index dd7b243..e1a3b6f 100644
--- a/infrastructure/addons/rancher/helmrelease-rancher.yaml
+++ b/infrastructure/addons/rancher/helmrelease-rancher.yaml
@@ -28,6 +28,8 @@ spec:
     extraEnv:
       - name: CATTLE_PROMETHEUS_METRICS
         value: "true"
+      - name: CATTLE_FEATURES
+        value: "managed-system-upgrade-controller=false"
     resources:
       requests:
         cpu: 500m