diff --git a/configure/group_vars/prod_vars.yml b/configure/group_vars/prod_vars.yml
index acedf9d..c14ba70 100644
--- a/configure/group_vars/prod_vars.yml
+++ b/configure/group_vars/prod_vars.yml
@@ -40,7 +40,7 @@ scheduled_job_repeat_interval: "120"
 
 avni_server_host: "localhost"
 avni_server_port: "8021"
-avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xms2560m -Xmx2560m -XX:MaxMetaspaceSize=512m -XX:CompressedClassSpaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{avni_server_access_log_dir}}/ -XX:OnOutOfMemoryError=\"shutdown -r\" -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:+UseStringDeduplication -XX:-OmitStackTraceInFastThrow -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Xloggc:{{avni_server_access_log_dir}}/gc.log"
+avni_server_opts: " -Dnewrelic.environment={{ newrelic_environment }} -javaagent:/opt/newrelic/newrelic.jar -Dlogging.file={{avni_server_access_log_dir}}/chs.log -Dlogging.path={{avni_server_access_log_dir}} -Dlogging.file.max-size=5mb -Dlogging.file.max-history=90 -Xms2560m -Xmx2560m -XX:MaxMetaspaceSize=512m -XX:CompressedClassSpaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath={{avni_server_access_log_dir}}/ -XX:OnOutOfMemoryError=\"/bin/kill -9 %p\" -XX:ErrorFile={{avni_server_access_log_dir}}/jvm.log -XX:+UseStringDeduplication -XX:-OmitStackTraceInFastThrow -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Xloggc:{{avni_server_access_log_dir}}/gc.log"
 avni_server_db_host: "serverdb.openchs.org."
 avni_server_db_port: "5432"
 avni_server_db_schema: "public"
diff --git a/configure/roles/appserver/templates/appserver.service.template.j2 b/configure/roles/appserver/templates/appserver.service.template.j2
index e412b7f..dc3f6f6 100644
--- a/configure/roles/appserver/templates/appserver.service.template.j2
+++ b/configure/roles/appserver/templates/appserver.service.template.j2
@@ -14,6 +14,8 @@ ExecReload=/bin/kill -s HUP $MAINPID
 KillMode=mixed
 TimeoutStopSec=5
 PrivateTmp=true
+# Let systemd restart this service always
+Restart=always
 
 [Install]
 WantedBy=multi-user.target