diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88d92c400c3c6f6da21fcf36eadb5a0f2370b5a5..b2690ff894f9359e0b408acbd309d8c8f8aea912 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,10 +11,10 @@ build-debian-stretch:
     paths:
       - build-stretch
   script:
-    - docker build -t radsecproxy-debbuild .
+    - docker build -f Dockerfile-stretch -t radsecproxy-debbuild-stretch .
     - rm -rf build-stretch
     - mkdir build-stretch
-    - docker run -i radsecproxy-debbuild | tar x -C build-stretch/
+    - docker run -i radsecproxy-debbuild-stretch | tar x -C build-stretch/
     - ls -l build-stretch/
 
 build-debian-buster:
@@ -26,10 +26,10 @@ build-debian-buster:
     paths:
       - build-buster
   script:
-    - docker build -t radsecproxy-debbuild .
+    - docker build -f Dockerfile-buster -t radsecproxy-debbuild-buster .
     - rm -rf build-buster
     - mkdir build-buster
-    - docker run -i radsecproxy-debbuild | tar x -C build-buster/
+    - docker run -i radsecproxy-debbuild-buster | tar x -C build-buster/
     - ls -l build-buster/
 
 deploy-apt:
diff --git a/Dockerfile b/Dockerfile-buster
similarity index 92%
rename from Dockerfile
rename to Dockerfile-buster
index 4964d7a356c2ad7dc0ca9b076ea56fafa57dfef9..959e4a7f4e992be6ca0464c5549adeea0d73206f 100644
--- a/Dockerfile
+++ b/Dockerfile-buster
@@ -2,7 +2,6 @@ FROM debian:buster
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x lsb-release
 WORKDIR /root/
-COPY patches patches
 COPY build.sh build.sh
 RUN ./build.sh
 CMD tar c *.deb
diff --git a/Dockerfile-stretch b/Dockerfile-stretch
new file mode 100644
index 0000000000000000000000000000000000000000..7c7d87370fb15155952a740119317661caded50f
--- /dev/null
+++ b/Dockerfile-stretch
@@ -0,0 +1,7 @@
+FROM debian:stretch
+RUN apt-get update && apt-get -y upgrade
+RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl1.0-dev nettle-dev docbook2x lsb-release
+WORKDIR /root/
+COPY build.sh build.sh
+RUN ./build.sh
+CMD tar c *.deb
diff --git a/README.md b/README.md
index 93951397faa85bc55e5568e55223fdfe5f0dfefa..2b8992566f7c10aa5c9ec43ac6410efe46a2ddfa 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,6 @@ This docker will generate a .deb package for Radsecproxy.
 Edit **build.sh** and set the desired version number for Radsecproxy.
 
 ```
-docker build -t radsecproxy-debbuild .
+docker build -f Dockerfile-[stretch|buster] -t radsecproxy-debbuild .
 docker run -i radsecproxy-debbuild | tar x
 ```
diff --git a/build.sh b/build.sh
index b5428029f07fdd570a03e88975cd477844edb983..cff8376610d92f838e14496b9271a88b3aa391c3 100755
--- a/build.sh
+++ b/build.sh
@@ -27,18 +27,10 @@ RADSECPROXY_URL="https://github.com/${package}/${package}"
 RADSECPROXY_SRCURL="${RADSECPROXY_URL}/releases/download/${version}/${package}-${version}.tar.gz"
 curl --silent -o "${package}"_"${version}".orig.tar.gz -L "${RADSECPROXY_SRCURL}"
 tar xzf "${package}"_"${version}".orig.tar.gz
-#git clone https://git.nordu.net/radsecproxy.git "${package}"-"${version}"
-#tar czf "${package}"_"${version}".orig.tar.gz "${package}"-"${version}"
-#( cd "${package}"-"${version}" ; aclocal ; automake --add-missing )
 
 apt-get source ${package}
 tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/"
 
-# cp patches/* "${package}"-"${version}"/debian/patches/
-# for patch in patches/* ; do
-#   echo ${patch##*/}
-# done >> "${package}"-"${version}"/debian/patches/series
-
 rm -r "${package}"-"${version}/debian/patches"
 
 cat > changelog << EOF