diff --git a/roles/nagios_client/templates/check_repospanner_proc.cfg.j2 b/roles/nagios_client/templates/check_repospanner_proc.cfg.j2
index 00d919d006..357b7f803f 100644
--- a/roles/nagios_client/templates/check_repospanner_proc.cfg.j2
+++ b/roles/nagios_client/templates/check_repospanner_proc.cfg.j2
@@ -1 +1 @@
-command[check_repospanner_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'repospanner'
+command[check_repospanner_proc]={{ libdir }}/nagios/plugins/check_procs -c 1:1 -C 'repospanner' -u repoSpanner
diff --git a/roles/repospanner/server/templates/repoSpanner.service b/roles/repospanner/server/templates/repoSpanner.service
index 61ee784adb..3b859293c1 100644
--- a/roles/repospanner/server/templates/repoSpanner.service
+++ b/roles/repospanner/server/templates/repoSpanner.service
@@ -7,3 +7,4 @@ Type=simple
 ExecStart=/usr/bin/repospanner serve --config /etc/repospanner/%i.yml --debug
 User=repoSpanner
 Group=repoSpanner
+LimitNOFILE=65536