diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b787bf6fe5fbfb057a90909a98651e64cd4d65b2..2ae42d21b81deb400de9b1b12b2e749a1f5d2f63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,19 +34,12 @@ test-basic:
     - build
   script:
     - DIR="$(pwd)"
-# write the job id to a file, so that eXist can read it (SADE: post-install.xql)
-    - echo -n "$CI_JOB_ID" > /tmp/ci.job
 # remove an old testlogfile
-    - rm -f build/sade_job-*
     - mv build/sade /opt/
     - bash '/opt/sade/bin/startup.sh' &
-    - while [ ! -f /opt/sade/sade.beacon ]; do sleep 2s; done && sleep 15s
+    - while [ $(curl --head --silent http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 2s; done
     - cd /opt/sade/bin; ./shutdown.sh -u admin -p "$pw"
     - cd $DIR
-    - mv /opt/sade_job* build/
-    - cat build/sade_job-*
-    - apt-get -qq update > /dev/null && apt-get -qq install bc > /dev/null
-    - ./generic-test.sh
   artifacts:
     paths:
       - build/*.xml
@@ -63,6 +56,11 @@ test-basic:
     - ./build/sade/bin/startup.sh & sleep 60; ./build/sade/bin/shutdown.sh
 
 generic:
+  only:
+    - develop
+    - master
+  except:
+    - tags
   stage: deploy
   script:
     - ant -f generic.xml build-debian-package
@@ -72,8 +70,13 @@ generic:
     - wget --no-check-certificate "https://res.de.dariah.eu/scripts/push-to-aptly.sh"
     - chmod +x push-to-aptly.sh
     - ./push-to-aptly.sh
-    
+
 architrave:
+  only:
+    - develop
+    - master
+  except:
+    - tags
   stage: deploy
   allow_failure: true
   script: