diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 880d76b..6ada666 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,7 @@ golang-1.8-git-2.8.4 test: *test_build
 omnibus-gitlab-centos6 test: *test_build
 omnibus-gitlab-centos7 test: *test_build
 omnibus-gitlab-jessie test: *test_build
+omnibus-gitlab-stretch test: *test_build
 omnibus-gitlab-opensuse42.2 test: *test_build
 omnibus-gitlab-trusty test: *test_build
 omnibus-gitlab-wheezy test: *test_build
@@ -66,6 +67,7 @@ golang-1.8-git-2.8.4: *build_and_deploy
 omnibus-gitlab-centos6: *build_and_deploy
 omnibus-gitlab-centos7: *build_and_deploy
 omnibus-gitlab-jessie: *build_and_deploy
+omnibus-gitlab-stretch: *build_and_deploy
 omnibus-gitlab-opensuse42.2: *build_and_deploy
 omnibus-gitlab-trusty: *build_and_deploy
 omnibus-gitlab-wheezy: *build_and_deploy
diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch
new file mode 100644
index 0000000..dcf5434
--- /dev/null
+++ b/Dockerfile.omnibus-gitlab-stretch
@@ -0,0 +1,15 @@
+FROM debian:stretch
+
+RUN apt-get update -q \
+        && apt-get install -y gcc git make curl zlib1g-dev libssl1.0-dev \
+        && rm -rf /var/lib/apt/lists/*
+
+ENV RUBY_VERSION 2.3.3
+RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
+  | tar -xzC /tmp \
+  && cd /tmp/ruby-2.3.3 \
+  && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
+  && make \
+  && make install
+
+RUN gem install bundler