diff --git a/modules/openstack_project/files/gerrit/change-merged b/modules/openstack_project/files/gerrit/change-merged
index 7516919104..ef0cd3a296 100755
--- a/modules/openstack_project/files/gerrit/change-merged
+++ b/modules/openstack_project/files/gerrit/change-merged
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-python /usr/local/gerrit/scripts/update_bug.py change-merged "$@"
+# Use timeout to kill any process running longer than 10 minutes.
+timeout -k 2m 10m python /usr/local/gerrit/scripts/update_bug.py change-merged "$@"
diff --git a/modules/openstack_project/files/gerrit/patchset-created b/modules/openstack_project/files/gerrit/patchset-created
index 4a582bd7ef..57eabcd94b 100755
--- a/modules/openstack_project/files/gerrit/patchset-created
+++ b/modules/openstack_project/files/gerrit/patchset-created
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-python /usr/local/gerrit/scripts/update_blueprint.py patchset-created "$@"
-python /usr/local/gerrit/scripts/update_bug.py patchset-created "$@"
-python /usr/local/gerrit/scripts/notify_doc_impact.py patchset-created "$@"
+# Use timeout to kill any process running longer than 10 minutes.
+timeout -k 2m 10m python /usr/local/gerrit/scripts/update_blueprint.py patchset-created "$@"
+timeout -k 2m 10m python /usr/local/gerrit/scripts/update_bug.py patchset-created "$@"
+timeout -k 2m 10m python /usr/local/gerrit/scripts/notify_doc_impact.py patchset-created "$@"