diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6dcecd567a8b..6e6eed0285502 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,8 +17,8 @@ env:
   DOCKER_EXPERIMENTAL: 1
   DOCKER_GRAPHDRIVER: overlay2
   BUILDKIT_PROGRESS: plain
-  BASE_DEBIAN_DISTRO: buster
-  GOLANG_VERSION: 1.16.7
+  BASE_DEBIAN_DISTRO: stretch
+  GO_VERSION: 1.16.7
   APT_MIRROR: cdn-fastly.deb.debian.org
   CHECK_CONFIG_COMMIT: 78405559cfe5987174aa2cb6463b9b2c1b917255
   TESTDEBUG: 0
@@ -48,7 +48,7 @@ jobs:
       id: setup-docker-make
       uses: WAGO/docker-actions/setup-docker-make@release/v1.0
       with:
-        golang-version: ${{ env.GOLANG_VERSION }}
+        golang-version: ${{ env.GO_VERSION }}
         base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
         host-arch: ${{ matrix.arch }}
         target-platform: ${{ matrix.platform }}
@@ -111,7 +111,7 @@ jobs:
       with:
         targets: |
           cross
-        golang-version: ${{ env.GOLANG_VERSION }}
+        golang-version: ${{ env.GO_VERSION }}
         base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
         host-arch: ${{ matrix.arch }}
         target-platform: ${{ matrix.platform }}
@@ -171,7 +171,7 @@ jobs:
       with:
         targets: |
           binary
-        golang-version: ${{ env.GOLANG_VERSION }}
+        golang-version: ${{ env.GO_VERSION }}
         base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
         host-arch: ${{ matrix.arch }}
         target-platform: ${{ matrix.platform }}
@@ -252,7 +252,7 @@ jobs:
       with:
         targets: |
           dynbinary
-        golang-version: ${{ env.GOLANG_VERSION }}
+        golang-version: ${{ env.GO_VERSION }}
         base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
         host-arch: ${{ matrix.arch }}
         target-platform: ${{ matrix.platform }}
@@ -337,7 +337,7 @@ jobs:
       with:
         targets: |
           test-unit
-        golang-version: ${{ env.GOLANG_VERSION }}
+        golang-version: ${{ env.GO_VERSION }}
         base-debian-distro: ${{ env.BASE_DEBIAN_DISTRO }}
         host-arch: ${{ matrix.arch }}
         target-platform: ${{ matrix.platform }}
diff --git a/Dockerfile b/Dockerfile
index 20dea15b82243..33afdcc381319 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"
 
-ARG BASE_DEBIAN_DISTRO="buster"
+ARG BASE_DEBIAN_DISTRO="stretch"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 
 FROM ${GOLANG_IMAGE} AS base
@@ -167,6 +167,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 FROM dev-base AS containerd
 ARG DEBIAN_FRONTEND
+RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list
 RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
     --mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
         apt-get update && apt-get install -y --no-install-recommends \