diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 811bc5d0df..535f699c11 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -313,4 +313,12 @@ class openstack_project::server (
     }
   }
 
+  # Disable cloud-init
+  file { '/etc/cloud':
+    ensure => directory,
+  }
+  file { '/etc/cloud/cloud-init.disabled':
+    ensure  => file,
+    require => File['/etc/cloud'],
+  }
 }