diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70587b98416624cac3a72f270c847e6e36d916bf..75714c424c9c6f5c8b81f194ab6e4210bcc5a27a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,8 @@
+variables:
+  TARGET_PLATFORMS:
+    description: Docker/OCI platform specifiers to build images for;
+      comma separated
+
 stages:
 - check
 - build
@@ -38,6 +43,7 @@ Checks:
     --local dockerfile=.
     --opt target=$TARGET
     --output=type=image,name=$CI_REGISTRY_IMAGE/$TARGET:build-$CI_PIPELINE_IID,push=true
+    ${TARGET_PLATFORMS:+--opt platform=$TARGET_PLATFORMS}
     ${REVISION:+--opt build-arg:REVISION=$REVISION}
     ${VERSION:+--opt build-arg:VERSION=$VERSION}
 
@@ -64,7 +70,7 @@ Build "buildctl":
 
 Deploy Images:
   stage: deploy
-  image: docker.kodo.org.uk/ci-images/docker-reg:latest
+  image: docker.kodo.org.uk/ci-images/docker-reg:0.2.0
   rules:
   - if: $CI_COMMIT_TAG =~ /^v[0-9]/
   script:
diff --git a/Dockerfile b/Dockerfile
index b67d4b1f659c3753534e1a4d7345998e02df7aaf..a35ff80f9f72e6c43f8c0cf042164364ad46e27e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG VERSION
 
-FROM --platform=$BUILDPLATFORM golang:1.17-alpine as go
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine as go
 
 # Get source code
 WORKDIR /src