diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c277765..f8277da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,8 +60,9 @@ ruby-2.3-golang-1.9-git-2.9 test: *test_custom
 ruby-2.3-golang-1.10-git-2.14 test: *test_custom
 ruby-2.3-golang-1.10-git-2.9 test: *test_custom
 ruby-2.3-golang-1.10-git-2.16 test: *test_custom
-ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
-ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
 golang-1.8.6-git-2.9.0 test: *test_custom
 golang-1.8.6-git-2.14 test: *test_custom
 golang-1.9-git-2.9.0 test: *test_custom
@@ -95,8 +96,8 @@ ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
-ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
-ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
 golang-1.8.6-git-2.9.0: *build_and_deploy_custom
 golang-1.8.6-git-2.14: *build_and_deploy_custom
 golang-1.9-git-2.9.0: *build_and_deploy_custom
diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic
index 3b3b1c3..790beab 100644
--- a/Dockerfile.omnibus-gitlab-bionic
+++ b/Dockerfile.omnibus-gitlab-bionic
@@ -12,10 +12,10 @@ ENV LC_ALL en_US.UTF-8
 ENV CC /usr/bin/gcc-6
 ENV CXX /usr/bin/g++-6
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6
index a0ff342..4c3e027 100644
--- a/Dockerfile.omnibus-gitlab-centos6
+++ b/Dockerfile.omnibus-gitlab-centos6
@@ -9,10 +9,10 @@ ENV LANG en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7
index 80e95bd..c5616d7 100644
--- a/Dockerfile.omnibus-gitlab-centos7
+++ b/Dockerfile.omnibus-gitlab-centos7
@@ -9,10 +9,10 @@ ENV LANG en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie
index 6f9c2cb..fef114f 100644
--- a/Dockerfile.omnibus-gitlab-jessie
+++ b/Dockerfile.omnibus-gitlab-jessie
@@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-opensuse42.3 b/Dockerfile.omnibus-gitlab-opensuse42.3
index f0d77b2..44f8604 100644
--- a/Dockerfile.omnibus-gitlab-opensuse42.3
+++ b/Dockerfile.omnibus-gitlab-opensuse42.3
@@ -10,10 +10,10 @@ ENV LC_ALL en_US.UTF-8
 ENV LANGUAGE en_US:en
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch
index eba4064..b5ac055 100644
--- a/Dockerfile.omnibus-gitlab-stretch
+++ b/Dockerfile.omnibus-gitlab-stretch
@@ -11,10 +11,10 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-trusty b/Dockerfile.omnibus-gitlab-trusty
index d382611..037f41e 100644
--- a/Dockerfile.omnibus-gitlab-trusty
+++ b/Dockerfile.omnibus-gitlab-trusty
@@ -4,10 +4,10 @@ RUN apt-get update -q \
         && apt-get install -y g++ gcc git make curl zlib1g-dev libssl-dev \
         && rm -rf /var/lib/apt/lists/*
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-wheezy b/Dockerfile.omnibus-gitlab-wheezy
index cd3e2d7..75657b4 100644
--- a/Dockerfile.omnibus-gitlab-wheezy
+++ b/Dockerfile.omnibus-gitlab-wheezy
@@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/Dockerfile.omnibus-gitlab-xenial b/Dockerfile.omnibus-gitlab-xenial
index 6436fc8..92f02da 100644
--- a/Dockerfile.omnibus-gitlab-xenial
+++ b/Dockerfile.omnibus-gitlab-xenial
@@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ENV RUBY_VERSION 2.3.3
+ENV RUBY_VERSION 2.3.7
 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 \
+  && cd /tmp/ruby-2.3.7 \
   && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
   && make \
   && make install
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 5922de0..a3c56d8 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -64,8 +64,12 @@ function print_git_args() {
             GIT_DOWNLOAD_SHA256=023ffff6d3ba8a1bea779dfecc0ed0bb4ad68ab8601d14435dd8c08416f78d7f
             ;;
         2.16)
-            GIT_VERSION=2.16.2
-            GIT_DOWNLOAD_SHA256=9acc4339b7a2ab484eea69d705923271682b7058015219cf5a7e6ed8dee5b5fb
+            GIT_VERSION=2.16.3
+            GIT_DOWNLOAD_SHA256=dda229e9c73f4fbb7d4324e0d993e11311673df03f73b194c554c2e9451e17cd
+            ;;
+        2.17)
+            GIT_VERSION=2.17.0
+            GIT_DOWNLOAD_SHA256=7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8
             ;;
         *) echo "Unknown git version $1"; exit 1;
     esac