diff --git a/README.md b/README.md
index 93c0575..6750b6b 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ Networks:
     This will be used for the SERVICE_URL and FILE_SERVER_ROOT. 
     Important: Changing those values in the config files later won't have any effect because they are written to the database. Those values have priority over the config files. To change them enter the "System Admin" section on the web-ui. If you encounter issues with file upload, it's likely that those are configured incorrectly.
      ```
-    - SEAFILE_SERVER_HOSTNAME=seafile.mydomain.com 
+    - SEAFILE_URL=seafile.mydomain.com 
      ```
     If you plan to use a reverse proxy with https, set this to true. This will replace http with https in the SERVICE_URL and FILE_SERVER_ROOT.
      ```
diff --git a/compose/docker-compose-dev.yml b/compose/docker-compose-dev.yml
index 22de78f..d993cc0 100644
--- a/compose/docker-compose-dev.yml
+++ b/compose/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
       - DB_ROOT_PASSWD=db_dev
       - TIME_ZONE=Europe/Berlin
       - HTTPS=false
-      - SEAFILE_SERVER_HOSTNAME=localhost
+      - SEAFILE_URL=localhost
     depends_on:
       - db
       - memcached
diff --git a/compose/docker-compose-swarm.yml b/compose/docker-compose-swarm.yml
index fd1cd89..722cb99 100644
--- a/compose/docker-compose-swarm.yml
+++ b/compose/docker-compose-swarm.yml
@@ -11,7 +11,7 @@ services:
       - SEAFILE_ADMIN_EMAIL=me@example.com
       - SEAFILE_ADMIN_PASSWORD=asecret
       - HTTPS=false # Set this to true if you plan to use a reverse proxy with HTTPS. Can be changed later in the admin settings on the web-ui.
-      - SEAFILE_SERVER_HOSTNAME=seafile.mydomain.com # Mandatory on first deployment!
+      - SEAFILE_URL=seafile.mydomain.com # Mandatory on first deployment!
     networks:
       - seafile-net
     deploy:
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 94ce669..91380b6 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - DB_ROOT_PASSWD=db_dev
       - TIME_ZONE=Europe/Berlin
       - HTTPS=true
-      - SEAFILE_SERVER_HOSTNAME=seafile.mydomain.com # Mandatory on first deployment!
+      - SEAFILE_URL=seafile.mydomain.com # Mandatory on first deployment!
     depends_on:
       - db
       - memcached
diff --git a/seafile-server/scripts/bootstrap.py b/seafile-server/scripts/bootstrap.py
index 4b00c56..2500d29 100644
--- a/seafile-server/scripts/bootstrap.py
+++ b/seafile-server/scripts/bootstrap.py
@@ -53,7 +53,7 @@ def init_seafile_server():
     loginfo('Now running setup-seafile-mysql.py in auto mode.')
     env = {
         'SERVER_NAME': 'seafile',
-        'SERVER_IP': get_conf('SEAFILE_SERVER_HOSTNAME', 'seafile.example.com'),
+        'SERVER_IP': get_conf('SEAFILE_URL', 'seafile.example.com'),
         'MYSQL_USER': 'seafile',
         'MYSQL_USER_PASSWD': str(uuid.uuid4()),
         'MYSQL_USER_HOST': '%.%.%.%',
@@ -76,7 +76,7 @@ def init_seafile_server():
     setup_script = get_script('setup-seafile-mysql.sh')
     call('{} auto -n seafile'.format(setup_script), env=env)
 
-    domain = get_conf('SEAFILE_SERVER_HOSTNAME', 'seafile.example.com')
+    domain = get_conf('SEAFILE_URL', 'seafile.example.com')
     proto = 'https' if is_https() else 'http'
     with open(join(topdir, 'conf', 'seahub_settings.py'), 'a+') as fp:
         fp.write('\n')