diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 47d4c4563..c1991f705 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,9 +2,9 @@ variables:
   UPSTREAM_REPO: monado/monado
 
   DEBIAN_VERSION: buster
-  DEBIAN_TAG: '2019-05-03.0'
+  DEBIAN_TAG: '2019-06-13.0'
   DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG
-  DEBIAN_DEBS: 'build-essential git cmake meson ninja-build doxygen graphviz libeigen3-dev curl patch python3 pkg-config libx11-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libhidapi-dev libwayland-dev libvulkan-dev glslang-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libuvc-dev libavcodec-dev libopencv-dev libudev-dev'
+  DEBIAN_DEBS: 'build-essential git cmake meson ninja-build doxygen graphviz libeigen3-dev curl patch python3 pkg-config libx11-dev libxxf86vm-dev libxrandr-dev libxcb-randr0-dev libhidapi-dev libwayland-dev libvulkan-dev glslang-dev glslang-tools libglvnd-dev libgl1-mesa-dev ca-certificates libusb-1.0-0-dev libuvc-dev libavcodec-dev libopencv-dev libudev-dev clang-format-7 codespell'
   DEBIAN_EXEC: 'bash .gitlab-ci/build-openxr-openhmd.sh'
   
   ARCH_TAG: '2019-04-18.0'
@@ -32,6 +32,17 @@ arch:container_prep:
   extends: .arch@container-ifnot-exists
   stage: container_prep
 
+format-and-spellcheck:
+  stage: build
+  image: $DEBIAN_CONTAINER_IMAGE
+  script:
+  - scripts/format-and-spellcheck.sh
+  artifacts:
+    paths:
+      - patches/
+    expire_in: 1 week
+    when: on_failure
+
 debian:build-cmake:
   stage: build
   image: $DEBIAN_CONTAINER_IMAGE