diff --git a/files/etc/init.d/zuul-merger b/files/etc/init.d/zuul-merger
index 30336cd..fc14a5b 100644
--- a/files/etc/init.d/zuul-merger
+++ b/files/etc/init.d/zuul-merger
@@ -50,6 +50,7 @@ do_start()
 
     mkdir -p /var/run/$NAME
     chown $USER /var/run/$NAME
+    ulimit -n 8192
     if [ -f $PIDFILE ]; then
         return 3
     fi
diff --git a/files/etc/systemd/system/zuul-merger.service b/files/etc/systemd/system/zuul-merger.service
index ab9990a..83c4dcd 100644
--- a/files/etc/systemd/system/zuul-merger.service
+++ b/files/etc/systemd/system/zuul-merger.service
@@ -6,6 +6,7 @@ After=syslog.target network.target
 Type=simple
 User=zuul
 Group=zuul
+LimitNOFILE=8192
 EnvironmentFile=-/etc/sysconfig/zuul-merger
 ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d"