diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a7e7ea..1c5965d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
 image: registry.opensuse.org/opensuse/infrastructure/containers/heroes-salt-testing:latest
 
-variables:
-  DOCKER_DRIVER: overlay2
-
 stages:
   - validate
   - test
@@ -16,7 +13,7 @@ validate:
   tags:
     - docker
 
-leap15.2_show_highstate:
+leap15.3_show_highstate:
   stage: validate
   before_script:
     - bin/prepare_test_env.sh -i opensuse -g -o Leap,15,3
diff --git a/bin/prepare_test_env.sh b/bin/prepare_test_env.sh
index bdbe6be..34b7b22 100755
--- a/bin/prepare_test_env.sh
+++ b/bin/prepare_test_env.sh
@@ -66,7 +66,8 @@ fi
 $SUDO rm -rf /srv/{salt,pillar} 2>/dev/null
 $SUDO ln -s $PWD/salt /srv/salt
 $SUDO ln -s $PWD/pillar /srv/pillar
-ID=$(hostname -f)
+
+ID=$(/usr/bin/hostname -f)
 
 printf "grains:\n  city: nuremberg\n  country: de\n  hostusage: test\n  reboot_safe: no\n  salt_cluster: $SALT_CLUSTER\n  virt_cluster: $VIRT_CLUSTER\n" > pillar/id/${ID//./_}.sls
 
diff --git a/bin/test_logrotate.sh b/bin/test_logrotate.sh
index 5b81a5b..24e9015 100755
--- a/bin/test_logrotate.sh
+++ b/bin/test_logrotate.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
-# [[ $(whoami) == 'root' ]] || { echo 'Please run this script as root'; exit 1; }
+OUTPUT=$(mktemp /tmp/$(basename $0)-XXXXXX) || exit 1;
 
-sudo logrotate --debug /etc/logrotate.conf
-if [ "$?" != 0 ]; then
-	echo 
-	echo "There is an error in one or more logrotate snipplets" >&2
+sudo logrotate --debug /etc/logrotate.conf 1>$OUTPUT 2>&1
+if [ $? != 0 ]; then
+    echo 
+    echo "There is an error in one or more logrotate snipplets" >&2
     echo
+    cat "$OUTPUT"
+    rm "$OUTPUT"
     exit 1
 fi
+rm "$OUTPUT"