diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml
new file mode 100644
index 00000000..dc153a94
--- /dev/null
+++ b/.github/workflows/spellcheck.yaml
@@ -0,0 +1,20 @@
+name: Spellcheck
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+env:
+  USER: root
+
+jobs:
+  spellcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run spellcheck
+        run: |
+          make spellcheck
+
diff --git a/tools/Dockerfile b/tools/Dockerfile
index 34cfbc4c..951ad5fa 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -7,6 +7,6 @@ COPY requirements.txt /root/requirements.txt
 RUN apt update && \
     apt install -y git aspell && \
     pip install -r /root/requirements.txt && \
-    groupadd -g $GID docs && \
-    useradd -u $UID -g $GID -m -s /bin/bash docs
+    groupadd -g $GID docs || true && \
+    useradd -u $UID -g $GID -m -s /bin/bash docs || true
 ENTRYPOINT bash