diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 9ed2f8b..668584d 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -366,6 +366,11 @@ management_oidc_client_secret: "{{ management_oidc_client_secret_vault }}"
 # push mirror: https://dev-gitea-01.smardigo.digital/gitea-admin/communication-keys/
 gpg_key_smardigo_automation__private: '{{ gpg_key_smardigo_automation__private__vault }}'
 
+# TODO Upgrade dev state for containerd usage
+k8s_basic_services:
+  - kubelet
+  - docker
+
 iam_opentracing_jaeger_enabled: true
 iam_opentracing_jaeger_http_sender_url: "http://{{ shared_service_kube_jaeger_collector_hostname }}/api/traces"
 webdav_opentracing_jaeger_enabled: true
diff --git a/patchday.yml b/patchday.yml
index 9c56f31..d42ac26 100644
--- a/patchday.yml
+++ b/patchday.yml
@@ -5,7 +5,6 @@
 
 - hosts: elastic
   serial: 1
-  become: yes
   tasks:
     - name: "Smardigo Patchday: update pkgs"
       ansible.builtin.apt:
@@ -33,7 +32,6 @@
         reboot_timeout: 300
 
     - name: "Smardigo Patchday: wait_for host after reboot"
-      become: no
       delegate_to: localhost
       ansible.builtin.wait_for:
         delay: 15
@@ -68,7 +66,6 @@
 
 - hosts: postgres
   serial: 1
-  become: yes
   tasks:
     - name: "Smardigo Patchday: stop service(s)"
       ansible.builtin.systemd:
@@ -88,7 +85,6 @@
         reboot_timeout: 300
 
     - name: "Smardigo Patchday: wait_for host after reboot"
-      become: no
       delegate_to: localhost
       ansible.builtin.wait_for:
         delay: 15
@@ -104,7 +100,6 @@
 
 - hosts: all,!elastic,!postgres,!k8s_cluster,!gw
   serial: 10
-  become: yes
   tasks:
     - name: "Smardigo Patchday: update pkgs"
       ansible.builtin.apt:
@@ -132,7 +127,6 @@
         reboot_timeout: 300
 
     - name: "Smardigo Patchday: wait_for host after reboot"
-      become: no
       delegate_to: localhost
       ansible.builtin.wait_for:
         delay: 15
@@ -149,7 +143,6 @@
 
 - hosts: k8s_cluster
   serial: 1
-  become: yes
 
   tasks:
       # draining the hard way
@@ -187,7 +180,6 @@
         reboot_timeout: 300
 
     - name: "Smardigo Patchday: wait_for host after reboot"
-      become: no
       delegate_to: localhost
       ansible.builtin.wait_for:
         delay: 15