diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile
index e1e4dd21..df91cf16 100644
--- a/docker/api/Dockerfile
+++ b/docker/api/Dockerfile
@@ -15,5 +15,5 @@ COPY modules /opt/wrolpi/modules
 COPY requirements.txt /opt/wrolpi/requirements.txt
 RUN pip3 install -r /opt/wrolpi/requirements.txt
 
-ENTRYPOINT [ "python3", "/opt/wrolpi/main.py"]
+ENTRYPOINT [ "python3", "-OO", "/opt/wrolpi/main.py"]
 CMD ["api", "--host", "0.0.0.0" ]
diff --git a/etc/raspberrypios/wrolpi-api.service b/etc/raspberrypios/wrolpi-api.service
index 3533fe9a..48e26a51 100644
--- a/etc/raspberrypios/wrolpi-api.service
+++ b/etc/raspberrypios/wrolpi-api.service
@@ -5,7 +5,7 @@ PartOf=wrolpi.target
 
 [Service]
 Environment=PYTHONUNBUFFERED=1
-ExecStart=/opt/wrolpi/venv/bin/python3 /opt/wrolpi/main.py -v api
+ExecStart=/opt/wrolpi/venv/bin/python3 -OO /opt/wrolpi/main.py -v api
 Group=wrolpi
 User=wrolpi
 WorkingDirectory=/opt/wrolpi/
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 639ac4ee..bc264d09 100755
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -7,3 +7,7 @@
 cp /opt/wrolpi/nginx.conf /etc/nginx/nginx.conf
 cp /opt/wrolpi/50x.html /var/www/50x.html
 /usr/sbin/nginx -s reload
+
+# Update systemd files.
+cp /opt/wrolpi/etc/raspberrypios/wrolpi-api.service /etc/systemd/system/
+/usr/bin/systemctl daemon-reload