diff --git a/ct/jotty.sh b/ct/jotty.sh
index 2b0836d5d..573140074 100644
--- a/ct/jotty.sh
+++ b/ct/jotty.sh
@@ -48,6 +48,17 @@ function update_script() {
     $STD yarn --frozen-lockfile
     $STD yarn next telemetry disable
     $STD yarn build
+
+    [ -d "public" ] && cp -r public .next/standalone/
+    [ -d "howto" ] && cp -r howto .next/standalone/
+    mkdir -p .next/standalone/.next
+    cp -r .next/static .next/standalone/.next/
+
+    mv .next/standalone /tmp/jotty_standalone
+    rm -rf * .next .git .gitignore .yarn
+    mv /tmp/jotty_standalone/* .
+    mv /tmp/jotty_standalone/.[!.]* . 2>/dev/null || true
+    rm -rf /tmp/jotty_standalone
     msg_ok "Updated jotty"
 
     msg_info "Restoring configuration & data"
@@ -55,6 +66,24 @@ function update_script() {
     $STD tar -xf /opt/data_config.tar
     msg_ok "Restored configuration & data"
 
+    msg_info "Updating Service"
+    cat <<EOF >/etc/systemd/system/jotty.service
+[Unit]
+Description=jotty server
+After=network.target
+
+[Service]
+WorkingDirectory=/opt/jotty
+EnvironmentFile=/opt/jotty/.env
+ExecStart=/usr/bin/node server.js
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    systemctl daemon-reload
+    msg_ok "Updated Service"
+
     msg_info "Starting Service"
     systemctl start jotty
     msg_ok "Started Service"
diff --git a/install/jotty-install.sh b/install/jotty-install.sh
index 7eb82583f..d5cc534c3 100644
--- a/install/jotty-install.sh
+++ b/install/jotty-install.sh
@@ -21,6 +21,18 @@ cd /opt/jotty
 $STD yarn --frozen-lockfile
 $STD yarn next telemetry disable
 $STD yarn build
+
+[ -d "public" ] && cp -r public .next/standalone/
+[ -d "howto" ] && cp -r howto .next/standalone/
+mkdir -p .next/standalone/.next
+cp -r .next/static .next/standalone/.next/
+
+mv .next/standalone /tmp/jotty_standalone
+rm -rf * .next .git .gitignore .yarn
+mv /tmp/jotty_standalone/* .
+mv /tmp/jotty_standalone/.[!.]* . 2>/dev/null || true
+rm -rf /tmp/jotty_standalone
+
 mkdir -p data/{users,checklists,notes}
 
 cat <<EOF >/opt/jotty/.env
@@ -55,7 +67,7 @@ After=network.target
 [Service]
 WorkingDirectory=/opt/jotty
 EnvironmentFile=/opt/jotty/.env
-ExecStart=yarn start
+ExecStart=/usr/bin/node server.js
 Restart=on-abnormal
 
 [Install]