diff --git a/src/tesk_core/taskmaster.py b/src/tesk_core/taskmaster.py
index 4fd506d..1a38a61 100755
--- a/src/tesk_core/taskmaster.py
+++ b/src/tesk_core/taskmaster.py
@@ -25,6 +25,15 @@ def run_executor(executor, namespace, pvc=None):
     if os.environ.get('EXECUTOR_BACKOFF_LIMIT') is not None:
         executor['spec'].update({'backoffLimit': int(os.environ['EXECUTOR_BACKOFF_LIMIT'])})
 
+    if 'restartPolicy'  not in spec.keys() and \
+       'restart_policy' in spec.keys():
+        spec['restartPolicy'] = spec['restart_policy']
+
+    for container in spec['containers']:
+        if container['resources']['limits'] is None and \
+           container['resources']['requests'] is not None:
+            container['resources']['limits'] = container['resources']['requests']
+
     if pvc is not None:
         mounts = spec['containers'][0].setdefault('volumeMounts', [])
         mounts.extend(pvc.volume_mounts)