diff --git a/docker-compose.yml b/docker-compose.yml
index 492671dbb0b0528c35452b1dd60514e21ba9842c..8a2f0101958557577c8bda35ee5f566adc490aac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,8 +11,6 @@ services:
       MYSQL_DATABASE: studip_db
       MYSQL_USER: studip_user
       MYSQL_PASSWORD: studip_password
-      DEMO_DATA: 1
-      MAIL_TRANSPORT: debug
   web:
     build:
       context: .
@@ -34,6 +32,7 @@ services:
       MYSQL_PASSWORD: studip_password
       MYSQL_HOST: db
       STUDIP_MAIL_TRANSPORT: debug
+      STUDIP_NAME: ${STUDIP_NAME}
 
       # Use automigrate to migrate your instance on startup
       AUTO_MIGRATE: 1
diff --git a/docker/studip/docker-entrypoint.sh b/docker/studip/docker-entrypoint.sh
index 111d35761c1126023e9e7b255e963209634cda9a..dde57c5d6e9b67df090522313ed8d6106234a425 100644
--- a/docker/studip/docker-entrypoint.sh
+++ b/docker/studip/docker-entrypoint.sh
@@ -28,7 +28,7 @@ done
 
 sh $STUDIP/.gitlab/scripts/install_db.sh
 
-if [ ! -z $AUTO_MIGRATE ]; then
+if [[ -n $AUTO_MIGRATE ]]; then
     echo "Migrate Instance"
     # If migrate fails start instance anyway
     php "$STUDIP/cli/studip" migrate || true
@@ -40,4 +40,10 @@ if [ "${1#-}" != "$1" ]; then
     set -- apache2-foreground "$@"
 fi
 
+# Set name of installation if set
+if [[ -n "$STUDIP_NAME" ]]; then
+    echo "Setting installation name"
+    php "$STUDIP/cli/studip" config:set UNI_NAME_CLEAN "$STUDIP_NAME"
+fi
+
 exec "$@"