diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/master/Dockerfile
index d48694d..cc3d9ae 100644
--- a/jenkins-docker/master/Dockerfile
+++ b/jenkins-docker/master/Dockerfile
@@ -75,7 +75,7 @@
      curl \
      dirmngr gnupg gpgv && \
      curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
-     echo "deb [arch=amd64] https://download.docker.com/linux/debian jessie stable" >> etc/apt/sources.list && \
+     echo "deb [arch=amd64] https://download.docker.com/linux/debian stretch stable" >> etc/apt/sources.list && \
      apt-get update && \
      apt-cache policy docker-engine && \
      apt-get install -y docker-ce=18.03.1~ce-0~debian
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 9d2c92f..2542906 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -58,7 +58,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-bazel:debian-jessie</image>
+            <image>gerritforge/gerrit-ci-slave-bazel:debian-stretch</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>
diff --git a/jenkins-docker/slave-bazel-docker/Dockerfile b/jenkins-docker/slave-bazel-docker/Dockerfile
index 02a816a..1dc5f66 100644
--- a/jenkins-docker/slave-bazel-docker/Dockerfile
+++ b/jenkins-docker/slave-bazel-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-jessie
+FROM gerritforge/gerrit-ci-slave-bazel:debian-stretch
 
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
     add-apt-repository \
diff --git a/jenkins-docker/slave-bazel-docker/Makefile b/jenkins-docker/slave-bazel-docker/Makefile
index 883287f..91ebb17 100644
--- a/jenkins-docker/slave-bazel-docker/Makefile
+++ b/jenkins-docker/slave-bazel-docker/Makefile
@@ -1,5 +1,5 @@
 NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave-bazel-docker:debian-jessie
+IMAGE=gerritforge/gerrit-ci-slave-bazel-docker:debian-stretch
 
 # Targets
 
diff --git a/jenkins-docker/slave-bazel-nocache/Dockerfile b/jenkins-docker/slave-bazel-nocache/Dockerfile
index a7a5eb9..7e48b3d 100644
--- a/jenkins-docker/slave-bazel-nocache/Dockerfile
+++ b/jenkins-docker/slave-bazel-nocache/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-buck:debian-jessie
+FROM gerritforge/gerrit-ci-slave-buck:debian-stretch
 
 ARG BAZEL_VER
 ARG BUILDIFIER_VER
diff --git a/jenkins-docker/slave-bazel-nocache/Makefile b/jenkins-docker/slave-bazel-nocache/Makefile
index 106039f..e9ba8eb 100644
--- a/jenkins-docker/slave-bazel-nocache/Makefile
+++ b/jenkins-docker/slave-bazel-nocache/Makefile
@@ -1,5 +1,5 @@
 NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave-bazel:debian-jessie-nocache
+IMAGE=gerritforge/gerrit-ci-slave-bazel:debian-stretch-nocache
 BAZEL_VER=0.22.0
 BUILDIFIER_VER=0.20.0
 
diff --git a/jenkins-docker/slave-bazel/Dockerfile b/jenkins-docker/slave-bazel/Dockerfile
index c888e15..bf05e41 100644
--- a/jenkins-docker/slave-bazel/Dockerfile
+++ b/jenkins-docker/slave-bazel/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-jessie-nocache
+FROM gerritforge/gerrit-ci-slave-bazel:debian-stretch-nocache
 
 # Bazel cache warm-up with Gerrit master and stable branches build
 # Set-up google-java-format utility to ~/format/google-java-format
diff --git a/jenkins-docker/slave-bazel/Makefile b/jenkins-docker/slave-bazel/Makefile
index 14b5364..631f6a8 100644
--- a/jenkins-docker/slave-bazel/Makefile
+++ b/jenkins-docker/slave-bazel/Makefile
@@ -1,5 +1,5 @@
 NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave-bazel:debian-jessie
+IMAGE=gerritforge/gerrit-ci-slave-bazel:debian-stretch
 
 # Targets
 
diff --git a/jenkins-docker/slave-buck/Dockerfile b/jenkins-docker/slave-buck/Dockerfile
index 0cb6547..67cb965 100644
--- a/jenkins-docker/slave-buck/Dockerfile
+++ b/jenkins-docker/slave-buck/Dockerfile
@@ -2,19 +2,17 @@
 
 # Buck build
 
-RUN git clone https://github.com/facebook/buck /opt/buck-java8 && \
-    cp -r /opt/buck-java8 /opt/buck-java7 && \
-    cd /opt/buck-java8 && git checkout e64a2e2ada022f81e42be750b774024469551398 && \
-    ant && chown -R jenkins:jenkins /opt/buck-java8 && \
-    cd /opt/buck-java7 && git checkout 6a42de3b4b7989d9c042c5524d765bf4a462dcb8 && \
-    bash -c '. /usr/bin/set-java.sh 7 && ant' && \
-    chown -R jenkins:jenkins /opt/buck-java7
+RUN git clone https://github.com/facebook/buck /opt/buck-java && \
+    cd /opt/buck-java && \
+    git checkout e64a2e2ada022f81e42be750b774024469551398 && \
+    ant && \
+    chown -R jenkins:jenkins /opt/buck-java
 
 COPY set-buck.sh /usr/bin/
 
 COPY default-buck.sh /etc/profile.d/
 
-RUN echo ". /usr/bin/set-buck.sh $1" >> /usr/bin/set-java.sh
+RUN echo ". /usr/bin/set-buck.sh" >> /usr/bin/set-java.sh
 
 ## NOTE ##
 # Watchman can be enabled (to enable buckd) by uncommenting the following
diff --git a/jenkins-docker/slave-buck/Makefile b/jenkins-docker/slave-buck/Makefile
index a833a40..83de1d7 100644
--- a/jenkins-docker/slave-buck/Makefile
+++ b/jenkins-docker/slave-buck/Makefile
@@ -1,5 +1,5 @@
 NO_CACHE=false
-IMAGE=gerritforge/gerrit-ci-slave-buck:debian-jessie
+IMAGE=gerritforge/gerrit-ci-slave-buck:debian-stretch
 NODE_VER ?= 10
 WCT_VER ?= 6.8.0
 
diff --git a/jenkins-docker/slave-buck/buckjavaargs b/jenkins-docker/slave-buck/buckjavaargs
index 42bd639..3eb655b 100644
--- a/jenkins-docker/slave-buck/buckjavaargs
+++ b/jenkins-docker/slave-buck/buckjavaargs
@@ -1 +1 @@
-  -XX:MaxPermSize=512m -Xms8000m -Xmx12000m
+  -Xms8000m -Xmx12000m
diff --git a/jenkins-docker/slave-buck/default-buck.sh b/jenkins-docker/slave-buck/default-buck.sh
index 4b99444..d9dbfa1 100755
--- a/jenkins-docker/slave-buck/default-buck.sh
+++ b/jenkins-docker/slave-buck/default-buck.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-. /usr/bin/set-buck.sh 8
+. /usr/bin/set-buck.sh
diff --git a/jenkins-docker/slave-buck/set-buck.sh b/jenkins-docker/slave-buck/set-buck.sh
index b0fc8eb..9b1c4cb 100755
--- a/jenkins-docker/slave-buck/set-buck.sh
+++ b/jenkins-docker/slave-buck/set-buck.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-if [ "$1" == "" ]
-then
-  echo "Set current Buck/Java version level"
-  echo ""
-  echo "Use: $0 <7|8>"
-  exit 1
-fi
-
-export PATH=/opt/buck-java$1/bin:$PATH
+export PATH=/opt/buck-java/bin:$PATH
 
 echo "Buck set to: $(which buck)"
diff --git a/jenkins-docker/slave-chrome/Makefile b/jenkins-docker/slave-chrome/Makefile
index da66111..2861732 100644
--- a/jenkins-docker/slave-chrome/Makefile
+++ b/jenkins-docker/slave-chrome/Makefile
@@ -1,33 +1,29 @@
 NO_CACHE ?= false
-DEBIAN_VER ?= jessie
+DEBIAN_VER ?= stretch
 CHROME_VER ?= 69.0.3497.92
 IMAGE=gerritforge/gerrit-ci-slave-chrome:$(DEBIAN_VER)-$(CHROME_VER)
 
-build: build_jessie build_stretch
+build: build_stretch
 
-publish: publish_jessie publish_stretch
+publish: publish_stretch
 
-clean: clean_jessie clean_stretch
-
-build_jessie publish_jessie clean_jessie: DEBIAN_VER=jessie
+clean: clean_stretch
 
 build_stretch publish_stretch clean_stretch: DEBIAN_VER=stretch
 
-publish_jessie: build_jessie
-
 publish_stretch: build_stretch
 
-build_jessie build_stretch: Makefile Dockerfile
+build_stretch: Makefile Dockerfile
 	@echo "Building Docker for $(DEBIAN_VER) / Chrome v$(CHROME_VER)"
 	@echo "==================================================="
 	cat Dockerfile | DEBIAN_VER=$(DEBIAN_VER) CHROME_VER=$(CHROME_VER) envsubst > Dockerfile-$(DEBIAN_VER)-$(CHROME_VER)
 	docker build --no-cache=$(NO_CACHE) -f Dockerfile-$(DEBIAN_VER)-$(CHROME_VER) -t $(IMAGE) .
 
-publish_jessie publish_stretch:
+publish_stretch:
 	docker push $(IMAGE)
 
-clean_jessie clean_stretch:
+clean_stretch:
 	docker rmi -f $(IMAGE)
 
-.PHONY: clean jessie stretch
+.PHONY: clean stretch
 
diff --git a/jenkins-docker/slave-debian/Dockerfile b/jenkins-docker/slave-debian/Dockerfile
index f20cbab..a09badd 100644
--- a/jenkins-docker/slave-debian/Dockerfile
+++ b/jenkins-docker/slave-debian/Dockerfile
@@ -29,19 +29,6 @@
     gettext-base \
     && rm -rf /var/lib/apt/lists/*
 
-
-RUN [ "$DEBIAN_VER" != "jessie" ] || \
-       ( echo "deb http://http.debian.net/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list && \
-         apt-get update && \
-         apt-get install -y -t jessie-backports ca-certificates-java && \
-         apt-get install -y -t jessie-backports openjdk-8-jre-headless && \
-         apt-get install -y -t jessie-backports openjdk-8-jdk && \
-         apt-get install -y -t jessie-backports git && \
-         update-java-alternatives -s java-1.8.0-openjdk-amd64 && \
-         mv /etc/apt/sources.list.d/jessie-backports.list /etc/apt/sources.list.d/jessie-backports.list.disabled && \
-         apt-get update && \
-         rm -rf /var/lib/apt/lists/* )
-
 RUN useradd jenkins -d /home/jenkins -m -s /bin/bash
 RUN mkdir /home/jenkins/.ssh
 RUN chown -R jenkins:jenkins /home/jenkins/.ssh
diff --git a/jenkins-docker/slave-debian/Makefile b/jenkins-docker/slave-debian/Makefile
index 532d8e2..31aa654 100644
--- a/jenkins-docker/slave-debian/Makefile
+++ b/jenkins-docker/slave-debian/Makefile
@@ -1,33 +1,29 @@
 NO_CACHE ?= false
 IMAGE=gerritforge/gerrit-ci-slave-debian
 
-build: build_stretch build_jessie
+build: build_stretch
 
-publish: publish_stretch publish_jessie
+publish: publish_stretch
 
-clean: clean_stretch clean_jessie
-
-build_jessie publish_jessie clean_jessie: DEBIAN_VER=jessie
+clean: clean_stretch
 
 build_stretch publish_stretch clean_stretch: DEBIAN_VER=stretch
 
-publish_jessie: build_jessie
-
 publish_stretch: build_stretch
 
-build_jessie build_stretch:  id_rsa.pub
+build_stretch:  id_rsa.pub
 	@echo "Building Docker for Debian:$(DEBIAN_VER)"
 	@echo "========================================"
 	cat Dockerfile | DEBIAN_VER=$(DEBIAN_VER) envsubst > Dockerfile-$(DEBIAN_VER)
 	docker build --no-cache=$(NO_CACHE) -f Dockerfile-$(DEBIAN_VER) -t ${IMAGE}:$(DEBIAN_VER) .
 
-publish_jessie publish_stretch:
+publish_stretch:
 	docker push ${IMAGE}:$(DEBIAN_VER)
 
 id_rsa.pub: ../master/id_rsa.pub
 	cp $? $@
 
-clean_stretch clean_jessie:
+clean_stretch:
 	docker rmi -f ${IMAGE}
 	-rm -f id_rsa*
 
diff --git a/jenkins-docker/slave-mvn/Dockerfile b/jenkins-docker/slave-mvn/Dockerfile
index 3a296a1..d7d2c38 100644
--- a/jenkins-docker/slave-mvn/Dockerfile
+++ b/jenkins-docker/slave-mvn/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-jessie
+FROM gerritforge/gerrit-ci-slave-bazel:debian-stretch
 
 USER jenkins
 
diff --git a/jenkins-docker/slave-node-wct/Dockerfile b/jenkins-docker/slave-node-wct/Dockerfile
index 2dd1a68..fd71d22 100644
--- a/jenkins-docker/slave-node-wct/Dockerfile
+++ b/jenkins-docker/slave-node-wct/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-chrome:jessie-69.0.3497.92
+FROM gerritforge/gerrit-ci-slave-chrome:stretch-69.0.3497.92
 
 # Node JS for PolyGerrit build
 
diff --git a/jenkins-docker/slave-release/Dockerfile b/jenkins-docker/slave-release/Dockerfile
index c3627da..cbb7874 100644
--- a/jenkins-docker/slave-release/Dockerfile
+++ b/jenkins-docker/slave-release/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-jessie-nocache
+FROM gerritforge/gerrit-ci-slave-bazel:debian-stretch-nocache
 
 RUN apt-get update && \
     apt-get install -y gnupg2 && \
diff --git a/jenkins-docker/slave-release/Makefile b/jenkins-docker/slave-release/Makefile
index 4941e1b..1df93f7 100644
--- a/jenkins-docker/slave-release/Makefile
+++ b/jenkins-docker/slave-release/Makefile
@@ -1,5 +1,5 @@
 NO_CACHE=false
-IMAGE=gerritforge/gerrit-release-bazel:debian-jessie
+IMAGE=gerritforge/gerrit-release-bazel:debian-stretch
 
 # Targets
 
diff --git a/jenkins-docker/slave-sbt/Dockerfile b/jenkins-docker/slave-sbt/Dockerfile
index 90126df..d301736 100644
--- a/jenkins-docker/slave-sbt/Dockerfile
+++ b/jenkins-docker/slave-sbt/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritforge/gerrit-ci-slave-bazel:debian-jessie
+FROM gerritforge/gerrit-ci-slave-bazel:debian-stretch
 
 # SBT Setup
 RUN apt-get update && \