diff --git a/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2 b/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
index 9f7b3e33c8..38ed3ef8b6 100644
--- a/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
+++ b/roles/taskotron/buildmaster-configure/templates/buildmaster.service.j2
@@ -1,6 +1,10 @@
 [Unit]
 Description=Buildmaster for taskbot
 After=network.target
+# Workaround for builmaster not starting on system reboot
+# https://pagure.io/taskotron/issue/139
+StartLimitIntervalSec=30m
+StartLimitBurst=5
 
 [Service]
 Type=forking
@@ -11,6 +15,10 @@ ExecStop=/bin/buildbot stop {{ buildmaster_dir }}
 ExecReload=/bin/buildbot reconfig {{ buildmaster_dir }}
 User={{ buildmaster_user }}
 Group={{ buildmaster_user }}
+# Workaround for builmaster not starting on system reboot
+# https://pagure.io/taskotron/issue/139
+Restart=on-failure
+RestartSec=60
 
 [Install]
 WantedBy=multi-user.target