diff --git a/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0-r3.ebuild b/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0-r4.ebuild
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0-r3.ebuild
rename to project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0-r4.ebuild
diff --git a/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0.ebuild b/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0.ebuild
index 44c9de9..be520bd 100644
--- a/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0.ebuild
+++ b/project-lakitu/app-emulation/cloud-init-config/cloud-init-config-1.0.0.ebuild
@@ -32,20 +32,25 @@
 	doins "${FILESDIR}"/ds-identify.cfg
 	
 	insinto /etc/cloud/cloud.cfg.d
+
 	if use platform_gcp; then
 		doins "${FILESDIR}/gcp/10-disable_ssh_publish_hostkeys.cfg"
-		doins "${FILESDIR}/gcp/91-datasource-gce.cfg"
-	elif use platform_aws; then
+	fi
+
+	if use platform_aws; then
 		doins "${FILESDIR}"/aws/90-default-user.cfg
-		doins "${FILESDIR}"/aws/91-datasource-ec2.cfg
+		doins "${FILESDIR}"/aws/91-datasource.cfg
 	elif use platform_azure; then
 		doins "${FILESDIR}"/azure/10_hostname.cfg
 		doins "${FILESDIR}"/azure/90-default-user.cfg
-		doins "${FILESDIR}"/azure/91-datasource-azure.cfg
+		doins "${FILESDIR}"/azure/91-datasource.cfg
 	elif use platform_vsphere; then
 		doins "${FILESDIR}"/vsphere/10_hostname.cfg
 		doins "${FILESDIR}"/vsphere/90-default-user.cfg
-		doins "${FILESDIR}"/vsphere/91-datasource-vmware-ovf.cfg
+		doins "${FILESDIR}"/vsphere/91-datasource.cfg
+	else
+		# by default we add [GCE, NoCloud, None] as the datasource.
+		doins "${FILESDIR}/gcp/91-datasource.cfg"
 	fi
 }
 
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource-ec2.cfg b/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource-ec2.cfg
deleted file mode 100644
index 6e4bc1b..0000000
--- a/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource-ec2.cfg
+++ /dev/null
@@ -1 +0,0 @@
-datasource_list: [ Ec2, NoCloud, None ]
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource.cfg b/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource.cfg
new file mode 100644
index 0000000..f15f0dc
--- /dev/null
+++ b/project-lakitu/app-emulation/cloud-init-config/files/aws/91-datasource.cfg
@@ -0,0 +1 @@
+datasource_list: [ Ec2, GCE, NoCloud, None ]
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource-azure.cfg b/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource-azure.cfg
deleted file mode 100644
index 7383df4..0000000
--- a/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource-azure.cfg
+++ /dev/null
@@ -1 +0,0 @@
-datasource_list: [ Azure, NoCloud, None ]
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource.cfg b/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource.cfg
new file mode 100644
index 0000000..7ea95dd
--- /dev/null
+++ b/project-lakitu/app-emulation/cloud-init-config/files/azure/91-datasource.cfg
@@ -0,0 +1 @@
+datasource_list: [ Azure, GCE, NoCloud, None ]
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/gcp/91-datasource-gce.cfg b/project-lakitu/app-emulation/cloud-init-config/files/gcp/91-datasource.cfg
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init-config/files/gcp/91-datasource-gce.cfg
rename to project-lakitu/app-emulation/cloud-init-config/files/gcp/91-datasource.cfg
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource-vmware-ovf.cfg b/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource-vmware-ovf.cfg
deleted file mode 100644
index 2d2cea7..0000000
--- a/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource-vmware-ovf.cfg
+++ /dev/null
@@ -1 +0,0 @@
-datasource_list: [ OVF, NoCloud, None ]
diff --git a/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource.cfg b/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource.cfg
new file mode 100644
index 0000000..d9e3681
--- /dev/null
+++ b/project-lakitu/app-emulation/cloud-init-config/files/vsphere/91-datasource.cfg
@@ -0,0 +1 @@
+datasource_list: [ OVF, GCE, NoCloud, None ]