diff --git a/roles/deploy-env/files/etc_default_kubelet.j2 b/roles/deploy-env/files/etc_default_kubelet.j2
new file mode 100644
index 0000000000..b542daa903
--- /dev/null
+++ b/roles/deploy-env/files/etc_default_kubelet.j2
@@ -0,0 +1 @@
+KUBELET_EXTRA_ARGS="{% if overlay_network_setup %}--node-ip {{ overlay_network_bridge_ip }}{% endif %}"
diff --git a/roles/deploy-env/files/kubeadm_config.yaml.j2 b/roles/deploy-env/files/kubeadm_config.yaml.j2
index 1b32d264d7..e12e154acb 100644
--- a/roles/deploy-env/files/kubeadm_config.yaml.j2
+++ b/roles/deploy-env/files/kubeadm_config.yaml.j2
@@ -12,6 +12,11 @@ networking:
   serviceSubnet: "{{ kubeadm.service_cidr }}"  # --service-cidr
   podSubnet: "{{ kubeadm.pod_network_cidr }}"  # --pod-network-cidr
   dnsDomain: "cluster.local"
+apiServer:
+  ControlPlaneComponent:
+    extraArgs:
+      - name: kubelet-preferred-address-types
+        value: "InternalIP,Hostname,InternalDNS,ExternalIP,ExternalDNS"
 ...
 ---
 apiVersion: kubeadm.k8s.io/v1beta4
diff --git a/roles/deploy-env/tasks/main.yaml b/roles/deploy-env/tasks/main.yaml
index 21f0e8c2d8..ede3950a6a 100644
--- a/roles/deploy-env/tasks/main.yaml
+++ b/roles/deploy-env/tasks/main.yaml
@@ -44,6 +44,12 @@
     file: k8s_control_plane.yaml
   when: inventory_hostname in (groups['k8s_control_plane'] | default([]))
 
+- name: Prepare kubeadm config
+  template:
+    src: files/etc_default_kubelet.j2
+    dest: /etc/default/kubelet
+  when: inventory_hostname in (groups['k8s_nodes'] | default([]))
+
 - name: Join workload nodes to cluster
   command: "{{ (groups['k8s_control_plane'] | map('extract', hostvars, ['join_command', 'stdout_lines', 0]))[0] }}"
   when: inventory_hostname in (groups['k8s_nodes'] | default([]))
diff --git a/roles/gather-pod-logs/tasks/main.yaml b/roles/gather-pod-logs/tasks/main.yaml
index d3a3a794ca..f236ebce66 100644
--- a/roles/gather-pod-logs/tasks/main.yaml
+++ b/roles/gather-pod-logs/tasks/main.yaml
@@ -24,13 +24,12 @@
 - name: "retrieve all kubernetes logs, current and previous (if they exist)"
   shell: |-
           set -e
-          PARALLELISM_FACTOR=2
           function get_namespaces () {
             kubectl get namespaces -o name | awk -F '/' '{ print $NF }'
           }
           function get_pods () {
             NAMESPACE=$1
-            kubectl get pods -n ${NAMESPACE} -o name | awk -F '/' '{ print $NF }' | xargs -L1 -P 1 -I {} echo ${NAMESPACE} {}
+            kubectl get pods -n ${NAMESPACE} -o name | awk -F '/' '{ print $NF }' | xargs -I {} echo ${NAMESPACE} {}
           }
           export -f get_pods
           function get_pod_logs () {
@@ -48,8 +47,8 @@
           }
           export -f get_pod_logs
           get_namespaces | \
-            xargs -r -n 1 -P ${PARALLELISM_FACTOR} -I {} bash -c 'get_pods "$@"' _ {} | \
-            xargs -r -n 2 -P ${PARALLELISM_FACTOR} -I {} bash -c 'get_pod_logs "$@"' _ {}
+            xargs -r -I {} bash -c 'get_pods "$@"' _ {} | \
+            xargs -r -I {} bash -c 'get_pod_logs "$@"' _ {}
   args:
     executable: /bin/bash
   ignore_errors: True