diff --git a/images/capi/ansible/node.retry b/images/capi/ansible/node.retry
new file mode 100644
index 0000000000..4ad96d5159
--- /dev/null
+++ b/images/capi/ansible/node.retry
@@ -0,0 +1 @@
+default
diff --git a/images/capi/ansible/node.yml b/images/capi/ansible/node.yml
index 0a3e3b26c3..c2cbfa5cdf 100644
--- a/images/capi/ansible/node.yml
+++ b/images/capi/ansible/node.yml
@@ -13,6 +13,8 @@
 # limitations under the License.
 ---
 - hosts: all
+  vars:
+    ansible_python_interpreter: "/usr/bin/python3"
   become: yes
 
   tasks:
diff --git a/images/kube-deploy/container-image/images/buster-aws/Dockerfile b/images/kube-deploy/container-image/images/buster-aws/Dockerfile
index 642ae236b7..03c65e65b6 100644
--- a/images/kube-deploy/container-image/images/buster-aws/Dockerfile
+++ b/images/kube-deploy/container-image/images/buster-aws/Dockerfile
@@ -9,3 +9,6 @@ RUN apt-get -y install --no-install-recommends cloud-init
 # Configure default user (admin) to match debian default image
 # https://salsa.debian.org/cloud-team/debian-cloud-images/-/blob/master/config_space/files/etc/cloud/cloud.cfg.d/01_debian_cloud.cfg/EC2
 COPY 01_debian_cloud.cfg /etc/cloud/cloud.cfg.d/
+
+RUN echo "cloud-init    cloud-init/datasources    multiselect    Ec2" | debconf-set-selections
+RUN apt-get -y install --no-install-recommends cloud-init