diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d7c8aa4ee8e9104ae3567b3692385deeea5d71c..452545b9743e841203c87e51e33d84c45b6cfee1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ cache:
     - 'mkdir .m2 || echo ".m2 directory exists already"'
     - 'cp ./scripts/settings.xml .m2/settings.xml'
   script:
-    - 'mvn $MAVEN_CLI_OPTS clean test javadoc:javadoc -Dwith-postgresql -Dtest.env.db.postgresql.host.name=postgres -Dtest.env.db.postgresql.user=$POSTGRES_USER -Dtest.env.db.postgresql.pass=$POSTGRES_PASSWORD -Ptomcat'
+    - 'mvn $MAVEN_CLI_OPTS clean test -Dwith-postgresql -Dtest.env.db.postgresql.host.name=postgres -Dtest.env.db.postgresql.user=$POSTGRES_USER -Dtest.env.db.postgresql.pass=$POSTGRES_PASSWORD -Ptomcat'
   services:
     - postgres:9.4
   tags:
diff --git a/scripts/uibk-release.sh b/scripts/uibk-release.sh
index a85df7f6c50c194b2bae45173a176f36c9c669c8..05a91a6d10ef2e9473cd71b2e1452700b5db4b75 100755
--- a/scripts/uibk-release.sh
+++ b/scripts/uibk-release.sh
@@ -74,5 +74,5 @@ then
 	exit 1
 fi
 
-mvn -s .m2/settings.xml -B release:prepare -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true" -DreleaseVersion=$NEW_VERSION -DdevelopmentVersion=${LASTTAG_VERSION_MM}-SNAPSHOT -Dtag=${NEW_TAG}
-mvn -s .m2/settings.xml -B release:perform -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true"
+mvn -s .m2/settings.xml -B release:prepare -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true -Dmaven.javadoc.skip=true" -DreleaseVersion=$NEW_VERSION -DdevelopmentVersion=${LASTTAG_VERSION_MM}-SNAPSHOT -Dtag=${NEW_TAG}
+mvn -s .m2/settings.xml -B release:perform -Darguments="-s .m2/settings.xml -DskipTests=true -DskipSeleniumTests=true -Dmaven.javadoc.skip=true"