diff --git a/etc/systemd/freemap-mapnik-ondemand.service b/etc/systemd/freemap-mapnik-ondemand.service
new file mode 100644
index 0000000..abb66f2
--- /dev/null
+++ b/etc/systemd/freemap-mapnik-ondemand.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Freemap Mapserver
+Requires=postgresql.service
+After=postgresql.service
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=freemap
+WorkingDirectory=/home/freemap/freemap-mapnik/
+Environment=NODE_ENV=ondemand
+Environment=GDAL_CACHEMAX=256
+Environment=UV_THREADPOOL_SIZE=32
+#LimitAS=21474836480
+ExecStart=/usr/bin/node --max-old-space-size=4096 dist/index.js
+# there seems to be some memory leak so restart the service every day
+RuntimeMaxSec=86400
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/etc/systemd/freemap-mapnik.service b/etc/systemd/freemap-mapnik-prerender.service
similarity index 62%
rename from etc/systemd/freemap-mapnik.service
rename to etc/systemd/freemap-mapnik-prerender.service
index 2306a6a..da7ade1 100644
--- a/etc/systemd/freemap-mapnik.service
+++ b/etc/systemd/freemap-mapnik-prerender.service
@@ -11,12 +11,15 @@ User=freemap
 WorkingDirectory=/home/freemap/freemap-mapnik/
 Environment=NODE_ENV=prerender
 Environment=GDAL_CACHEMAX=256
-Environment=UV_THREADPOOL_SIZE=16
+Environment=UV_THREADPOOL_SIZE=32
 Environment=FM_CUSTOM_SQL="set_backend_priority(pg_backend_pid(), 10),"
-ExecStart=/usr/bin/node --max-old-space-size=4096 --unhandled-rejections=strict index.js
+#LimitAS=34359738368
+#LimitAS=68719476736
+ExecStart=/usr/bin/node --max-old-space-size=10000 dist/index.js
 Nice=15
-RuntimeMaxSec=10800
-LimitAS=21474836480
+# there seems to be some memory leak so restart the service every day
+RuntimeMaxSec=86400
 
 [Install]
 WantedBy=multi-user.target
+