diff --git a/docker/Makefile b/docker/Makefile
index 522397f4..d0f6d899 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,14 +1,13 @@
-STEAMRT_VERSION = 0.20220601.0
+STEAMRT_VERSION = 0.20221017.1
 STEAMRT_URLBASE = registry.gitlab.steamos.cloud
 
-PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/soldier/sdk
+PROTONSDK_URLBASE = $(STEAMRT_URLBASE)/proton/sniper/sdk
 PROTONSDK_VERSION = $(STEAMRT_VERSION)-0-dev
 
 # this is just for building toolchain, as we do static builds it should
 # not have any impact on the end result, but changing it will invalidate
 # docker caches, so we need something that don't change much
-BASE_IMAGE_i686 = docker.io/i386/ubuntu:18.04
-BASE_IMAGE_x86_64 = docker.io/amd64/ubuntu:18.04
+BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:0.20221017.1
 
 BINUTILS_VERSION = 2.37
 GCC_VERSION = 10.3.0
@@ -84,7 +83,6 @@ DOCKER = docker
 define create-build-base-rules
 .PHONY: build-base-$(1)
 all build-base: build-base-$(1)
-build-base-$(1): BASE_IMAGE = $(BASE_IMAGE_$(1))
 build-base-$(1): build-base-$(1).Dockerfile
 	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
@@ -189,7 +187,7 @@ $(eval $(call create-gcc-rules,x86_64,w64-mingw32))
 define create-proton-rules
 .PHONY: proton
 all: proton
-proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/soldier/sdk:$(STEAMRT_VERSION)
+proton: BASE_IMAGE = $(STEAMRT_URLBASE)/steamrt/sniper/sdk:$(STEAMRT_VERSION)
 proton: proton.Dockerfile | gcc
 	rm -rf build; mkdir -p build
 	$(DOCKER) build -f $$< \
diff --git a/docker/README.md b/docker/README.md
index 75818392..c0066f93 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,9 @@
-Proton (soldier) SDK
+Proton (sniper) SDK
 ====================
 
 These are the build rules that are used to create docker images to build
 Proton. The automated creation of the official images lives in
-<https://gitlab.steamos.cloud/proton/soldier/sdk>, but this can be
+<https://gitlab.steamos.cloud/proton/sniper/sdk>, but this can be
 used to create local images too.
 
 Local usage
@@ -31,7 +31,7 @@ To update the official Proton SDK images:
    commit and push the changes.
 
 2) Update `.gitlab-ci.yml` in the
-   [Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk)
+   [Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk)
    repository to point to the new commit, commit and push to trigger a
    new build of "-dev" images.
 
@@ -72,7 +72,7 @@ replacements done using `sed`.
 The <https://gitlab.steamos.cloud> CI uses Kaniko instead of Docker,
 with a bit of script conversion to generate commands usable there. More
 details are available in
-[Proton SDK](https://gitlab.steamos.cloud/proton/soldier/sdk).
+[Proton SDK](https://gitlab.steamos.cloud/proton/sniper/sdk).
 
 The `build-base` images are there to create a common ground to build the
 other elements of the toolchain. They are based on fairly recent (more