diff --git a/cloud/google/manager.py b/cloud/google/manager.py
index c6f0307..1cd0566 100644
--- a/cloud/google/manager.py
+++ b/cloud/google/manager.py
@@ -38,6 +38,7 @@ def GenerateEnvironVar(context, hostname_manager):
         'POSTGRES_USER': postgres_user,
         'POSTGRES_PASSWORD': postgres_password,
         'POSTGRES_DB': postgres_db,
+        'POSTGRES_SHM_MB': """$(free -m|grep Mem|awk '{print int($2/16)}')""",
         'POSTGRES_MEM_MB': """$(free -m|grep Mem|awk '{print int($2/4)}')""",
         'POSTGRES_MAX_CONN': """$(free -m|grep Mem|awk '{print int($2/32)}')""",
         'GRAFANA_USERNAME': grafana_username,
diff --git a/deploy/docker-compose-CeleryExecutor.yml b/deploy/docker-compose-CeleryExecutor.yml
index d7f88fd..5324e8c 100644
--- a/deploy/docker-compose-CeleryExecutor.yml
+++ b/deploy/docker-compose-CeleryExecutor.yml
@@ -61,6 +61,7 @@ services:
             - POSTGRES_USER
             - POSTGRES_PASSWORD
             - POSTGRES_DB
+        shm_size: "${POSTGRES_SHM_MB}m"
         volumes:
             - postgres-storage:/var/lib/postgresql/data
         command: -c max_connections=${POSTGRES_MAX_CONN} -c shared_buffers=${POSTGRES_MEM_MB}MB -c idle_in_transaction_session_timeout=300000