diff --git a/ansible/roles/configure/tasks/redhat.yml b/ansible/roles/configure/tasks/redhat.yml
index d071913..e40e314 100644
--- a/ansible/roles/configure/tasks/redhat.yml
+++ b/ansible/roles/configure/tasks/redhat.yml
@@ -28,9 +28,29 @@
     state: disabled
     policy: targeted
 
+# Tasks for configuring cloud-init.
+- block:
+    - name: "Message: Configuring cloud-init"
+      ansible.builtin.debug:
+        msg: "Configuring cloud-init"
+    - name: "Add Proxmox datasource"
+      ansible.builtin.copy:
+        content: "datasource_list: [ NoCloud, ConfigDrive ]"
+        dest: /etc/cloud/cloud.cfg.d/99_pve.cfg
+    - name: Enable cloud-init services
+      ansible.builtin.service:
+        name: "{{ item }}"
+        enabled: true
+      loop:
+        - cloud-config
+        - cloud-init
+        - cloud-init-local
+        - cloud-final
+  when: enable_cloudinit == 'true'
+
 # Tasks for restarting the SSH daemon.
 - name: "Restarting the SSH daemon."
   ansible.builtin.systemd:
     name: sshd
     state: restarted
-    daemon_reload: true
+    daemon_reload: true
\ No newline at end of file
diff --git a/ansible/roles/configure/tasks/suse.yml b/ansible/roles/configure/tasks/suse.yml
index 96f092e..2a9e9eb 100644
--- a/ansible/roles/configure/tasks/suse.yml
+++ b/ansible/roles/configure/tasks/suse.yml
@@ -31,13 +31,6 @@
   ansible.builtin.hostname:
     name: "localhost"
 
-# Tasks for restarting the SSH daemon.
-- name: "Restarting the SSH daemon."
-  ansible.builtin.systemd:
-    name: sshd
-    state: restarted
-    daemon_reload: true
-
 # Tasks for configuring cloud-init.
 - name: "Configuring cloud-init."
   block:
@@ -45,8 +38,20 @@
       ansible.builtin.debug:
         msg: "Configuring cloud-init"
     - ansible.builtin.copy:
-        content: 'datasource_list: [ ConfigDrive, NoCloud ]'
-        dest: /etc/cloud/cloud.cfg.d/90_dpkg.cfg
+        content: "datasource_list: [ NoCloud, ConfigDrive ]"
+        dest: /etc/cloud/cloud.cfg.d/99_pve.cfg
+    - name: Enable cloud-init services
+      ansible.builtin.service:
+        name: "{{ item }}"
+        enabled: true
+      loop:
+        - cloud-init
+        - cloud-init-local
   when: enable_cloudinit == 'true'
 
-...
\ No newline at end of file
+# Tasks for restarting the SSH daemon.
+- name: "Restarting the SSH daemon."
+  ansible.builtin.systemd:
+    name: sshd
+    state: restarted
+    daemon_reload: true