diff --git a/client b/client
index 5cc6fd79..461c1037 160000
--- a/client
+++ b/client
@@ -1 +1 @@
-Subproject commit 5cc6fd79d112ce36d6298c61bb8817689c4c323b
+Subproject commit 461c1037997f9fb88075b75612b83cea297ced42
diff --git a/docker-compose.yml b/docker-compose.yml
index 212f9df3..8ac8c272 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       options:
         max-file: "30"
   pyxform:
-    image: 'ghcr.io/getodk/pyxform-http:v1.7.0'
+    image: 'ghcr.io/getodk/pyxform-http:v1.8.0'
     restart: always
   secrets:
     volumes:
diff --git a/enketo.dockerfile b/enketo.dockerfile
index dd5ca093..cac54003 100644
--- a/enketo.dockerfile
+++ b/enketo.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo-express:3.0.4
+FROM ghcr.io/enketo/enketo-express:3.1.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}
@@ -16,10 +16,6 @@ COPY files/enketo/start-enketo.sh ${ENKETO_SRC_DIR}/start-enketo.sh
 
 RUN apt-get update; apt-get install gettext-base
 
-RUN npm install
-RUN grunt
-RUN npm prune --production
-
 EXPOSE 8005
 
 CMD ./start-enketo.sh
diff --git a/files/service/crontab b/files/service/crontab
index 08c13375..6d8b914e 100644
--- a/files/service/crontab
+++ b/files/service/crontab
@@ -1,3 +1,4 @@
+0 4 * * * root /usr/odk/purge-forms.sh
 0 3 * * * root /usr/odk/run-analytics.sh
 0 2 * * * root /usr/odk/run-backup.sh
 0 1 * * 0 root /usr/odk/reap-sessions.sh
diff --git a/files/service/scripts/purge-forms.sh b/files/service/scripts/purge-forms.sh
new file mode 100755
index 00000000..1ffa8e18
--- /dev/null
+++ b/files/service/scripts/purge-forms.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd /usr/odk
+/usr/local/bin/node lib/bin/purge-forms.js >/proc/1/fd/1 2>/proc/1/fd/2
+
diff --git a/server b/server
index 1d1a3a59..e8576862 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 1d1a3a59969e61383da74119e405e67778b7a170
+Subproject commit e8576862920de2189e073fc19aa3beb4e0622d1e