diff --git a/ansible/roles/providers/tasks/vmware-ubuntu.yml b/ansible/roles/providers/tasks/vmware-ubuntu.yml
index f9aacdb..8a63b50 100644
--- a/ansible/roles/providers/tasks/vmware-ubuntu.yml
+++ b/ansible/roles/providers/tasks/vmware-ubuntu.yml
@@ -43,3 +43,11 @@
     - { src: files/etc/networkd-dispatcher/routable.d/20-chrony.j2, dest: /etc/networkd-dispatcher/routable.d/20-chrony }
     - { src: files/etc/networkd-dispatcher/off.d/20-chrony.j2, dest: /etc/networkd-dispatcher/off.d/20-chrony }
     - { src: files/etc/networkd-dispatcher/no-carrier.d/20-chrony.j2, dest: /etc/networkd-dispatcher/no-carrier.d/20-chrony }
+
+- name: Create cloud-init datasource config file
+  copy:
+    dest: /etc/cloud/ds-identify.cfg
+    force: true
+    content: |
+      datasource: VMware
+  when: ansible_distribution_version is version('22.04', '>=')
diff --git a/ansible/roles/sysprep/tasks/debian.yml b/ansible/roles/sysprep/tasks/debian.yml
index 05f3a3c..51fbf57 100644
--- a/ansible/roles/sysprep/tasks/debian.yml
+++ b/ansible/roles/sysprep/tasks/debian.yml
@@ -93,3 +93,15 @@
   file:
     state: absent
     path: /etc/udev/rules.d/70-persistent-net.rules
+
+- name: Removing subiquity disable cloud-init networking config
+  file:
+    path: /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg
+    state: absent
+  when: ansible_distribution_version is version('22.04', '>=')
+
+- name: Removing 99-installer.cfg which sets the cloud-init datasource to None
+  file:
+    path: /etc/cloud/cloud.cfg.d/99-installer.cfg
+    state: absent
+  when: ansible_distribution_version is version('22.04', '>=')