diff --git a/manifests/analytics/quickstart.pp b/manifests/analytics/quickstart.pp
index 2652934..4e5f8f9 100644
--- a/manifests/analytics/quickstart.pp
+++ b/manifests/analytics/quickstart.pp
@@ -42,14 +42,16 @@ class midonet::analytics::quickstart (
   $config_path      = '/etc/midonet/midonet.conf',
 ) {
 
-  file { 'midonet folder':
-    ensure => 'directory',
-    path   => '/etc/midonet',
-    owner  => 'root',
-    mode   => '0755',
+  if !defined(File['midonet folder']) {
+    file { 'midonet folder':
+      ensure => 'directory',
+      path   => '/etc/midonet',
+      owner  => 'root',
+      mode   => '0755',
+    }
   }
 
-    if !defined(File['set_config']) {
+  if !defined(File['set_config']) {
     file { 'set_config':
       ensure  => present,
       path    => $config_path,
diff --git a/manifests/cluster/run.pp b/manifests/cluster/run.pp
index e9acff2..6f1a1bb 100644
--- a/manifests/cluster/run.pp
+++ b/manifests/cluster/run.pp
@@ -197,13 +197,15 @@ class midonet::cluster::run (
 
     exec { '/bin/bash /tmp/mn-cluster_config.sh': }
 
-    file { 'set_config':
-      ensure  => present,
-      path    => $cluster_config_path,
-      content => template('midonet/cluster/midonet.conf.erb'),
-      require => Package['midonet-cluster'],
-      notify  => Service['midonet-cluster'],
-      before  => File['/tmp/mn-cluster_config.sh'],
+    if !defined(File['set_config']) {
+      file { 'set_config':
+        ensure  => present,
+        path    => $cluster_config_path,
+        content => template('midonet/cluster/midonet.conf.erb'),
+        require => Package['midonet-cluster'],
+        notify  => Service['midonet-cluster'],
+        before  => File['/tmp/mn-cluster_config.sh'],
+      }
     }
 
     file { 'cluster_jvm_config':