diff --git a/Dockerfile b/Dockerfile
index 9238fd2..3c52b74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,10 @@
 FROM jenkins/jenkins:lts
 USER root
-RUN echo 'deb-src http://ftp.us.debian.org/debian/ stable main non-free contrib' >> /etc/apt/sources.list
+RUN echo 'deb-src http://ftp.us.debian.org/debian/ stretch main non-free contrib' >> /etc/apt/sources.list
 RUN apt-get -y update
+RUN apt-get -y upgrade
 RUN apt-get -y install patch build-essential rsync
-RUN apt-get -y build-dep sqlcipher libdbd-sqlite3-perl
+RUN apt-get -y build-dep sqlcipher libdbd-sqlite3-perl debhelper
 RUN apt-get -y install libvirt-clients libvirt0 libjna-java
 COPY libvirt-java_0.5.1_all.deb /tmp/libvirt-java_0.5.1_all.deb
 RUN dpkg -i /tmp/libvirt-java_0.5.1_all.deb
diff --git a/upgrade.sh b/upgrade.sh
index f21344e..cbe1de0 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -7,6 +7,6 @@ TAG=$(date "+%Y%m%d%H%M%S")
 
 docker pull jenkins/jenkins:lts
 docker build -t custom_jenkins:$TAG ~/workspace/jenkins_docker
-docker stop jenkins
-docker rm jenkins
+docker stop jenkins || echo "No container to stop"
+docker rm jenkins || echo "No container to remove"
 docker run -d --restart=always -p 8080:8080 -v jenkins_home:/var/jenkins_home --name jenkins custom_jenkins:$TAG