diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8e51c50544e3332ad452d629cf69caca1f284ff..d0da6386d4e0a82d08db4a9448371e47f9f6e326 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,10 @@ before_script:
   - mv sources.list.new /etc/apt/sources.list
   - apt-get update
   - apt-get install -y dpkg-dev quilt devscripts
+  - export DEBIAN_FRONTEND="noninteractive"
+  - export DEBIAN_PRIORITY="critical"
+  - export DEBFULLNAME="FSMPI Admin-Team"
+  - export DEBEMAIL="admin@fsmpi.rwth-aachen.de"
 #  - python3 -m venv venv
 #  - source venv/bin/activate
 #  - pip install wheel
@@ -21,11 +25,30 @@ sssd:
   stage: build
   script: scripts/sssd.sh
   artifacts: 
-    path: 
-      - packages/*.deb
-stages:
-  - build
+    paths: 
+      - packages/
+
+adcli:
+  stage: build
+  script: scripts/adcli.sh
+  artifacts: 
+    paths: 
+      - packages/
+      
+nginx:
+  stage: build
+  script: scripts/nginx.sh
+  artifacts: 
+    paths: 
+      - packages/
 
-build:
+ganeti:
   stage: build
-  script: scripts/build.py
+  script: scripts/ganeti.sh
+  artifacts: 
+    paths: 
+      - packages/
+
+
+stages:
+  - build
diff --git a/scripts/adcli.sh b/scripts/adcli.sh
old mode 100644
new mode 100755
index 35549ec75673a211090931a8a50f7d27f5e35094..b3928e7da917f3bcdd065dcb050d9a0674647587
--- a/scripts/adcli.sh
+++ b/scripts/adcli.sh
@@ -1,24 +1,33 @@
 #!/bin/bash
 
-export DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_PRIORITY="critical"
 
-export DEBFULLNAME = "FSMPI Admin-Team"
-export DEBEMAIL = "admin@fsmpi.rwth-aachen.de"
 
-ADCLI_VERSION=$(rmadison adcli --architecture=amd64 | cut -d\| -f2 | sed s"/ //g" | sed s"/\-.*$//g")
+ADCLI_VERSION=$(rmadison adcli --architecture=amd64 -s stretch| cut -d\| -f2 | sed s"/ //g" | sed s"/\-.*$//g")
 
-apt-get source adcli
-TARGET_DIR=adcli-$ADCLI_VERSION
+echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch main" > /etc/apt/sources.list.d/stretch_src.list
 
-#cp -r patches/adcli $TARGET_DIR/debian
+apt-get update
+apt-get source --only-source adcli
+TARGET_DIR=adcli-$ADCLI_VERSION
 
-cd $TARGET_DIR/debian
+cd ${TARGET_DIR}/debian
 
 for patch in ../../patches/adcli/*.patch ; do
     quilt import $patch
 done 
 
+cd ..
+
+debchange --preserve --newversion ${ADCLI_VERSION}-fsmpi "Apply the unreleased upstream-patches, fixing RT#100"
+
+apt-get build-dep -y adcli
+
+fakeroot debian/rules binary
+debuild -b -uc -us
+
+cd ..
+mkdir debug packages
+mv *dbgsym* debug
+mv *.deb packages
 
 
-#TODO: pakete bauen
diff --git a/scripts/ganeti.sh b/scripts/ganeti.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7184a4aaa73b75c5502cb9d81770607a1ac874a7
--- /dev/null
+++ b/scripts/ganeti.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+
+
+GANETI_VERSION=$(rmadison ganeti -s stretch| cut -d\| -f2 | sed s"/ //g" | sed s"/\-.*$//g")
+
+echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch main" > /etc/apt/sources.list.d/stretch_src.list
+
+apt-get update
+apt-get source --only-source ganeti
+TARGET_DIR=ganeti-$GANETI_VERSION
+
+cd ${TARGET_DIR}/debian
+
+for patch in ../../patches/ganeti/*.patch ; do
+    quilt import $patch
+done 
+
+cd ..
+
+
+function dch() {
+    debchange --preserve --newversion ${GANETI_VERSION}-fsmpi $1
+}
+
+dch "Fix broken ceph support in bdev.py, see GitHub #1233." 
+dch "Remove blockdev storage from the movable and mirrored devices lists."
+dch "Increase maximum disk count per instance."
+dch "Add support for disk cache usage with rbd devices."
+
+apt-get build-dep -y ganeti
+
+fakeroot debian/rules binary
+debuild -b -uc -us
+
+cd ..
+mkdir debug packages
+mv *dbgsym* debug
+mv *.deb packages
+
+
diff --git a/scripts/nginx-shib.sh b/scripts/nginx-shib.sh
new file mode 100755
index 0000000000000000000000000000000000000000..60c1ebcb7ae5088999f9fca961b69634ef1bddc6
--- /dev/null
+++ b/scripts/nginx-shib.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+
+
+NGINX_VERSION=$(rmadison nginx -s stretch| cut -d\| -f2 | sed s"/ //g" | sed s"/\-.*$//g")
+
+echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch main" > /etc/apt/sources.list.d/stretch_src.list
+
+apt-get update
+apt-get source --only-source nginx
+TARGET_DIR=nginx-$NGINX_VERSION
+
+cd ${TARGET_DIR}/debian/modules
+
+git clone "https://github.com/nginx-shib/nginx-http-shibboleth.git"
+
+cd ..
+cp libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx
+
+cd ..
+
+patch -d . -p0 < ../patches/nginx/00-add-module.patch
+
+debchange --preserve --newversion ${NGINX_VERSION}-fsmpi "Add libnginx-mod-http-shibboleth"
+
+apt-get build-dep -y nginx
+
+fakeroot debian/rules binary
+debuild -b -uc -us
+
+cd ..
+mkdir debug packages
+mv *dbgsym* debug
+mv *.deb packages
+
+
diff --git a/scripts/sssd.sh b/scripts/sssd.sh
index 742eec6cbcb85a6305f62d5831b9e472b15dbae6..88672a540a4fe9e737ba761814bd9002de597520 100755
--- a/scripts/sssd.sh
+++ b/scripts/sssd.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-export DEBIAN_FRONTEND="noninteractive"
-export DEBIAN_PRIORITY="critical"
-
 echo "deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main" > /etc/apt/sources.list.d/buster_src.list
 apt-get update
 apt-get source --only-source -t buster sssd
@@ -13,7 +10,7 @@ dch --local ~bpo9+ --distribution stretch-backports "Rebuild for stretch-backpor
 fakeroot debian/rules binary
 debuild -us -uc -nc
 
-cd /root
+cd ..
 mkdir debug packages
 mv *dbgsym* debug
 mv *.deb packages