diff --git a/murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh b/murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh
index 1122182..8458007 100644
--- a/murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh
+++ b/murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh
@@ -1,5 +1,16 @@
 #!/usr/bin/env bash
 
+# As described in https://bugs.launchpad.net/murano/+bug/1598232
+# murano-agent set the working directory depending on where the script
+# is located. Check and set working directory to the root of the
+# temporary folder which created by murano for the current execution plan
+# This code must work even if LP1598232 will be fixed
+
+if [ -d ../core ]
+then
+    cd ..
+fi
+
 set +e
 
 puppet apply --detailed-exitcodes --color=false "site.pp"