diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc
index 2baa2d433a..e68b860383 100644
--- a/services/spelling/.nvmrc
+++ b/services/spelling/.nvmrc
@@ -1 +1 @@
-10.23.1
+12.21.0
diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile
index 1fcc677d92..185686be4d 100644
--- a/services/spelling/Dockerfile
+++ b/services/spelling/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 
-FROM node:10.23.1 as base
+FROM node:12.21.0 as base
 
 WORKDIR /app
 COPY install_deps.sh /app
diff --git a/services/spelling/Makefile b/services/spelling/Makefile
index e698a356e9..d0a88a8c23 100644
--- a/services/spelling/Makefile
+++ b/services/spelling/Makefile
@@ -21,8 +21,10 @@ DOCKER_COMPOSE_TEST_UNIT = \
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 
 clean:
-	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
+	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
 
 format:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format
diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt
index 4f4c994f01..f31500afcc 100644
--- a/services/spelling/buildscript.txt
+++ b/services/spelling/buildscript.txt
@@ -4,6 +4,6 @@ spelling
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=False
---script-version=3.4.0
+--script-version=3.7.0