diff --git a/jobs/postgres-10/monit b/jobs/postgres-10/monit
index 7ff4169d4cc..ef0e0abf199 100644
--- a/jobs/postgres-10/monit
+++ b/jobs/postgres-10/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres-10/postgres-10.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres-10" with timeout 300 seconds
-  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres-10"
+  stop program "/var/vcap/jobs/postgres-10/bin/bpm-stop-postgres"
   group vcap
diff --git a/jobs/postgres-10/spec b/jobs/postgres-10/spec
index a9ea92143f3..57be1523f5e 100644
--- a/jobs/postgres-10/spec
+++ b/jobs/postgres-10/spec
@@ -7,6 +7,7 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
+  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-10
diff --git a/jobs/postgres-10/templates/bpm-stop-postgres b/jobs/postgres-10/templates/bpm-stop-postgres
new file mode 100755
index 00000000000..17d5aece59e
--- /dev/null
+++ b/jobs/postgres-10/templates/bpm-stop-postgres
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail
+
+postgres_pid=$(/var/vcap/packages/bpm/bin/bpm pid postgres-10)
+kill -s SIGINT "${postgres_pid}"
+
+/var/vcap/jobs/bpm/bin/bpm stop postgres-10
diff --git a/jobs/postgres-9.4/monit b/jobs/postgres-9.4/monit
index 999de4f1c0a..25be4849c68 100644
--- a/jobs/postgres-9.4/monit
+++ b/jobs/postgres-9.4/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres-9.4/postgres-9.4.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres-9.4" with timeout 300 seconds
-  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres-9.4"
+  stop program "/var/vcap/jobs/postgres-9.4/bin/bpm-stop-postgres"
   group vcap
diff --git a/jobs/postgres-9.4/spec b/jobs/postgres-9.4/spec
index d36274eadb8..5abf57427b6 100644
--- a/jobs/postgres-9.4/spec
+++ b/jobs/postgres-9.4/spec
@@ -7,6 +7,7 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
+  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-9.4
diff --git a/jobs/postgres-9.4/templates/bpm-stop-postgres b/jobs/postgres-9.4/templates/bpm-stop-postgres
new file mode 100755
index 00000000000..98152769330
--- /dev/null
+++ b/jobs/postgres-9.4/templates/bpm-stop-postgres
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail
+
+postgres_pid=$(/var/vcap/packages/bpm/bin/bpm pid postgres-9.4)
+kill -s SIGINT "${postgres_pid}"
+
+/var/vcap/jobs/bpm/bin/bpm stop postgres-9.4
diff --git a/jobs/postgres/monit b/jobs/postgres/monit
index 7c3ef102a37..2c40d5b8f3f 100644
--- a/jobs/postgres/monit
+++ b/jobs/postgres/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres/postgres.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres" with timeout 300 seconds
-  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres"
+  stop program "/var/vcap/jobs/postgres/bin/bpm-stop-postgres"
   group vcap
diff --git a/jobs/postgres/spec b/jobs/postgres/spec
index 5819872734a..f072811a886 100644
--- a/jobs/postgres/spec
+++ b/jobs/postgres/spec
@@ -7,6 +7,7 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
+  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-13
diff --git a/jobs/postgres/templates/bpm-stop-postgres b/jobs/postgres/templates/bpm-stop-postgres
new file mode 100755
index 00000000000..32b7e595485
--- /dev/null
+++ b/jobs/postgres/templates/bpm-stop-postgres
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e -o pipefail
+
+postgres_pid=$(/var/vcap/packages/bpm/bin/bpm pid postgres)
+kill -s SIGINT "${postgres_pid}"
+
+/var/vcap/jobs/bpm/bin/bpm stop postgres