diff --git a/Dockerfile.packaging b/Dockerfile.packaging
index be321fa8d..96927413e 100644
--- a/Dockerfile.packaging
+++ b/Dockerfile.packaging
@@ -1,4 +1,9 @@
-FROM golang:1.17
+FROM golang:1.17-stretch
+
+# Update stretch repositories
+RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
+           -e 's|security.debian.org|archive.debian.org/|g' \
+           -e '/stretch-updates/d' /etc/apt/sources.list
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential
diff --git a/Dockerfile.test b/Dockerfile.test
index e9155763c..e031d6023 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,6 +1,11 @@
-FROM golang:1.17
+FROM golang:1.17-stretch
 LABEL maintainer="github@github.com"
 
+#Update stretch repositories
+RUN sed -i -e 's/deb.debian.org/archive.debian.org/g' \
+           -e 's|security.debian.org|archive.debian.org/|g' \
+           -e '/stretch-updates/d' /etc/apt/sources.list
+
 RUN apt-get update
 RUN apt-get install -y lsb-release
 RUN rm -rf /var/lib/apt/lists/*