diff --git a/core/base/libs/socrate/socrate/system.py b/core/base/libs/socrate/socrate/system.py
index c6cbd9cb..e80863b8 100644
--- a/core/base/libs/socrate/socrate/system.py
+++ b/core/base/libs/socrate/socrate/system.py
@@ -97,7 +97,7 @@ def set_env(required_secrets=[], log_filters=[], log_file=None):
     for secret in required_secrets:
         os.environ[f'{secret}_KEY'] = hmac.new(bytearray(secret_key, 'utf-8'), bytearray(secret, 'utf-8'), 'sha256').hexdigest()
 
-    os.system('find / -xdev -type f -name \*.pid -print -delete')
+    os.system('find /run -xdev -type f -name \*.pid -print -delete')
 
     return {
             key: _coerce_value(os.environ.get(key, value))
diff --git a/core/postfix/start.py b/core/postfix/start.py
index 25787e8e..56adba4f 100755
--- a/core/postfix/start.py
+++ b/core/postfix/start.py
@@ -16,6 +16,8 @@ system.set_env(log_filters=[
     r'discarding EHLO keywords\: PIPELINING$',
     ], log_file=os.environ.get('POSTFIX_LOG_FILE'))
 
+os.system("flock -n /queue/pid/master.pid rm /queue/pid/master.pid")
+
 def start_podop():
     system.drop_privs_to('postfix')
     os.makedirs('/dev/shm/postfix',mode=0o700, exist_ok=True)