diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e5a6d5960eccd50ab4c9af19d2e4096ad4374ae..460f7f503f4cf57ce339f184eeb69fe20011e730 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,6 +48,24 @@ build-golang-dev:
     - docker push "$CI_REGISTRY_IMAGE/golang:latest-dev"
   except:
     - master
+     
+# Debian Stretch builds
+build-debian-stretch-build-master:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:stretch" ./debian/stretch
+    - docker push "$CI_REGISTRY_IMAGE/debian:stretch"
+  only:
+    - master
+  when: manual
+
+build-debian-stretch-build-dev:
+  stage: deploy
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:stretch-dev" ./debian/stretch
+    - docker push "$CI_REGISTRY_IMAGE/debian:stretch-dev"
+  except:
+    - master
 
 # Debian Jessie builds
 build-debian-jessie-build-master:
diff --git a/debian/stretch/Dockerfile b/debian/stretch/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..c98a98ec7110a0167c166d5fe4d203ef5223bb11
--- /dev/null
+++ b/debian/stretch/Dockerfile
@@ -0,0 +1,33 @@
+FROM debian:stretch
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN echo "deb http://security.debian.org/ stretch/updates main" >> /etc/apt/sources.list
+
+RUN apt-get update \
+    && apt-get -yqqf --no-install-recommends install \
+        apt-transport-https \
+        lsb-release \
+        ca-certificates \
+        curl \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -ssL -o /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
+
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install \
+        git \
+        dh-make \
+        build-essential \
+        autoconf \
+        autotools-dev \
+        libpcre3 \
+        libpcre3-dev \
+        libz-dev \
+        gnupg \
+        libssl-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*