diff --git a/resources/ceph_keys/meta.yaml b/resources/ceph_keys/meta.yaml
index 0cbb4574..4a61d4f6 100644
--- a/resources/ceph_keys/meta.yaml
+++ b/resources/ceph_keys/meta.yaml
@@ -7,7 +7,7 @@ input:
         value:
     target_directory:
         schema: str!
-        value: /var/lib/astute
+        value: /var/lib/astute/
     key_name:
         schema: str!
         value: ceph
diff --git a/solar/solar/core/handlers/puppet.py b/solar/solar/core/handlers/puppet.py
index 7da06ed0..4cb616f5 100644
--- a/solar/solar/core/handlers/puppet.py
+++ b/solar/solar/core/handlers/puppet.py
@@ -103,12 +103,14 @@ class Puppet(TempFileHandler):
 
         self.upload_manifests(resource)
 
+        action_file_name = '/tmp/{}.pp'.format(resource.name)
         self.prepare_templates_and_scripts(resource, action_file, '')
-        self.transport_sync.copy(resource, action_file, '/tmp/action.pp')
+        self.transport_sync.copy(resource, action_file, action_file_name)
         self.transport_sync.sync_all()
 
         cmd_args = ['puppet', 'apply', '-vd',
-                    '/tmp/action.pp', '--detailed-exitcodes']
+                    action_file_name,
+                    '--detailed-exitcodes']
         if 'puppet_modules' in resource.args:
             cmd_args.append('--modulepath={}'.format(
                 resource.args['puppet_modules']))
diff --git a/solar/solar/core/handlers/shell.py b/solar/solar/core/handlers/shell.py
index 2bbe1e6f..f65780b7 100644
--- a/solar/solar/core/handlers/shell.py
+++ b/solar/solar/core/handlers/shell.py
@@ -24,11 +24,12 @@ class Shell(TempFileHandler):
         action_file = self._compile_action_file(resource, action_name)
         log.debug('action_file: %s', action_file)
 
-        self.transport_sync.copy(resource, action_file, '/tmp/action.sh')
+        action_file_name = '/tmp/{}.sh'.format(resource.name)
+        self.transport_sync.copy(resource, action_file, action_file_name)
         self.transport_sync.sync_all()
         cmd = self.transport_run.run(
             resource,
-            'bash', '/tmp/action.sh',
+            'bash', action_file_name,
             use_sudo=True,
             warn_only=True
         )