diff --git a/packstack/installer/basedefs.py b/packstack/installer/basedefs.py
index d7b056064..eddd13a03 100644
--- a/packstack/installer/basedefs.py
+++ b/packstack/installer/basedefs.py
@@ -1,13 +1,16 @@
 """
 provides all the predefined variables for engine-setup
 """
-import os, sys
+import os, sys, uuid
 
 APP_NAME = "Installer"
 
 FILE_YUM_VERSION_LOCK="/etc/yum/pluginconf.d/versionlock.list"
 
-DIR_LOG = "/var/tmp"
+VAR_DIR = os.path.join("/var/tmp", str(uuid.uuid4()))
+DIR_LOG = VAR_DIR
+PUPPET_MANIFEST_DIR = os.path.join(VAR_DIR, "manifests")
+
 FILE_INSTALLER_LOG = "setup.log"
 
 DIR_PROJECT_DIR = os.environ.get('INSTALLER_PROJECT_DIR', os.path.join(os.path.split(sys.argv[0])[0], 'sample-project'))
diff --git a/packstack/modules/ospluginutils.py b/packstack/modules/ospluginutils.py
index 35bc744d6..20611dfb4 100644
--- a/packstack/modules/ospluginutils.py
+++ b/packstack/modules/ospluginutils.py
@@ -7,7 +7,6 @@ from packstack.installer.setup_controller import Controller
 controller = Controller()
 
 PUPPET_DIR = os.path.join(basedefs.DIR_PROJECT_DIR, "puppet")
-PUPPET_MANIFEST_DIR = os.path.join(PUPPET_DIR, "manifests")
 PUPPET_TEMPLATE_DIR = os.path.join(PUPPET_DIR, "templates")
 
 class NovaConfig(object):
@@ -34,7 +33,7 @@ def getManifestTemplate(template_name):
         return fp.read()%controller.CONF
 
 def appendManifestFile(manifest_name, data):
-    manifestfile = os.path.join(PUPPET_MANIFEST_DIR, manifest_name)
+    manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, manifest_name)
     if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
         controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
     with open(manifestfile, 'a') as fp:
diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py
index 5deeb709b..d3de986f2 100644
--- a/packstack/plugins/cinder_250.py
+++ b/packstack/plugins/cinder_250.py
@@ -22,7 +22,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 logging.debug("plugin %s loaded", __name__)
 
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/cinder.pp')
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 
 def initConfig(controllerObject):
     global controller
diff --git a/packstack/plugins/glance_200.py b/packstack/plugins/glance_200.py
index e288b27a1..0ca1797ea 100644
--- a/packstack/plugins/glance_200.py
+++ b/packstack/plugins/glance_200.py
@@ -23,7 +23,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 logging.debug("plugin %s loaded", __name__)
 
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/glance.pp')
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 
 def initConfig(controllerObject):
     global controller
diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
index 35db6d43b..d369d4d9c 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -20,7 +20,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 
 logging.debug("plugin %s loaded", __name__)
 
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/keystone.pp')
 
 
@@ -88,9 +87,9 @@ def createmanifest():
         manifestdata = fp.read()
     manifestdata = manifestdata%controller.CONF
 
-    if not os.path.exists(PUPPET_MANIFEST_DIR):
-        os.mkdir(PUPPET_MANIFEST_DIR)
-    manifestfile = os.path.join(PUPPET_MANIFEST_DIR, "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST'])
+    if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
+        os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
+    manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST'])
     if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
         controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
 
diff --git a/packstack/plugins/mysql_001.py b/packstack/plugins/mysql_001.py
index 05113ca0e..a5f28bc8b 100644
--- a/packstack/plugins/mysql_001.py
+++ b/packstack/plugins/mysql_001.py
@@ -20,7 +20,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 
 logging.debug("plugin %s loaded", __name__)
 
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/mysql.pp')
 
 def initConfig(controllerObject):
@@ -88,9 +87,9 @@ def createmanifest():
         manifestdata = fp.read()
     manifestdata = manifestdata%controller.CONF
 
-    if not os.path.exists(PUPPET_MANIFEST_DIR):
-        os.mkdir(PUPPET_MANIFEST_DIR)
-    manifestfile = os.path.join(PUPPET_MANIFEST_DIR, "%s_mysql.pp"%controller.CONF['CONFIG_MYSQL_HOST'])
+    if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
+        os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
+    manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_mysql.pp"%controller.CONF['CONFIG_MYSQL_HOST'])
     if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
         controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
 
diff --git a/packstack/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py
index dfe3e7039..c6289053f 100644
--- a/packstack/plugins/openstack_client_400.py
+++ b/packstack/plugins/openstack_client_400.py
@@ -20,7 +20,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 
 logging.debug("plugin %s loaded", __name__)
 
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/openstack_client.pp')
 
 
@@ -67,9 +66,9 @@ def createmanifest():
         manifestdata = fp.read()
     manifestdata = manifestdata%controller.CONF
 
-    if not os.path.exists(PUPPET_MANIFEST_DIR):
-        os.mkdir(PUPPET_MANIFEST_DIR)
-    manifestfile = os.path.join(PUPPET_MANIFEST_DIR, "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST'])
+    if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
+        os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
+    manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_osclient.pp"%controller.CONF['CONFIG_OSCLIENT_HOST'])
     if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
         controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)
 
diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py
index f41c29634..6152910bd 100644
--- a/packstack/plugins/puppet_950.py
+++ b/packstack/plugins/puppet_950.py
@@ -23,7 +23,6 @@ logging.debug("plugin %s loaded", __name__)
 
 PUPPETDIR      = os.path.abspath(os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet'))
 MODULEDIR = os.path.join(PUPPETDIR, "modules")
-MANIFESTDIR = os.path.join(PUPPETDIR, "manifests")
 
 def initConfig(controllerObject):
     global controller
@@ -59,7 +58,7 @@ def initSequences(controller):
 
 def runCleanup():
     localserver = utils.ScriptRunner()
-    localserver.append("rm -rf %s/*pp"%MANIFESTDIR)
+    localserver.append("rm -rf %s/*pp"%basedefs.PUPPET_MANIFEST_DIR)
     localserver.execute()
 
 def installpuppet():
@@ -78,7 +77,9 @@ def copyPuppetModules():
         tar_opts += "--exclude create_resources "
     for hostname in gethostlist(controller.CONF):
         server.append("cd %s"%basedefs.DIR_PROJECT_DIR,)
-        server.append("tar %s --dereference -czf - puppet/manifests puppet/modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C /etc -xzf -"%(tar_opts, hostname))
+        server.append("tar %s --dereference -czf - puppet/modules | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C /etc -xzf -"%(tar_opts, hostname))
+        server.append("cd %s"%basedefs.PUPPET_MANIFEST_DIR)
+        server.append("tar %s --dereference -czf - ../manifests | ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null root@%s tar -C /etc/puppet -xzf -"%(tar_opts, hostname))
     server.execute()
 
 def applyPuppetManifest():
diff --git a/packstack/plugins/qpid_002.py b/packstack/plugins/qpid_002.py
index 626371e55..78ae022ef 100644
--- a/packstack/plugins/qpid_002.py
+++ b/packstack/plugins/qpid_002.py
@@ -19,7 +19,6 @@ PLUGIN_NAME_COLORED = utils.getColoredText(PLUGIN_NAME, basedefs.BLUE)
 
 logging.debug("plugin %s loaded", __name__)
 
-PUPPET_MANIFEST_DIR      = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/manifests')
 PUPPET_MANIFEST_TEMPLATE = os.path.join(basedefs.DIR_PROJECT_DIR, 'puppet/templates/qpid.pp')
 
 def initConfig(controllerObject):
@@ -65,9 +64,9 @@ def createmanifest():
         manifestdata = fp.read()
     manifestdata = manifestdata%controller.CONF
 
-    if not os.path.exists(PUPPET_MANIFEST_DIR):
-        os.mkdir(PUPPET_MANIFEST_DIR)
-    manifestfile = os.path.join(PUPPET_MANIFEST_DIR, "%s_qpid.pp"%controller.CONF['CONFIG_QPID_HOST'])
+    if not os.path.exists(basedefs.PUPPET_MANIFEST_DIR):
+        os.mkdir(basedefs.PUPPET_MANIFEST_DIR)
+    manifestfile = os.path.join(basedefs.PUPPET_MANIFEST_DIR, "%s_qpid.pp"%controller.CONF['CONFIG_QPID_HOST'])
     if manifestfile not in controller.CONF['CONFIG_MANIFESTFILES']:
         controller.CONF['CONFIG_MANIFESTFILES'].append(manifestfile)