diff --git a/.env.example b/.env.example
index 39f369d2..f01cd28a 100644
--- a/.env.example
+++ b/.env.example
@@ -14,7 +14,7 @@
 # Instance configuration
 #--------------------------------------------------------------------
 app.baseURL="https://YOUR_DOMAIN_NAME/"
-app.mediaBaseURL="https://YOUR_MEDIA_DOMAIN_NAME/"
+media.baseURL="https://YOUR_MEDIA_DOMAIN_NAME/"
 admin.gateway="cp-admin"
 auth.gateway="cp-auth"
 
diff --git a/docker/production/app/entrypoint.sh b/docker/production/app/entrypoint.sh
index b24dcab0..623ef13d 100644
--- a/docker/production/app/entrypoint.sh
+++ b/docker/production/app/entrypoint.sh
@@ -107,7 +107,7 @@ fi
 
 cat << EOF > /opt/castopod/.env
 app.baseURL="${CP_BASEURL}"
-app.mediaBaseURL="${CP_MEDIA_BASEURL}"
+media.baseURL="${CP_MEDIA_BASEURL}"
 EOF
 
 if [ "${CP_DISABLE_HTTPS}" == "1" ]
diff --git a/docker/production/unit/entrypoint.sh b/docker/production/unit/entrypoint.sh
index 62a1036e..01904073 100644
--- a/docker/production/unit/entrypoint.sh
+++ b/docker/production/unit/entrypoint.sh
@@ -107,7 +107,7 @@ fi
 
 cat << EOF > /var/www/castopod/.env
 app.baseURL="${CP_BASEURL}"
-app.mediaBaseURL="${CP_MEDIA_BASEURL}"
+media.baseURL="${CP_MEDIA_BASEURL}"
 EOF
 
 if [ "${CP_DISABLE_HTTPS}" = "1" ]
diff --git a/docs/src/ar/contributing/setup-development.md b/docs/src/ar/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/ar/contributing/setup-development.md
+++ b/docs/src/ar/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/br/contributing/setup-development.md b/docs/src/br/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/br/contributing/setup-development.md
+++ b/docs/src/br/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/de/contributing/setup-development.md b/docs/src/de/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/de/contributing/setup-development.md
+++ b/docs/src/de/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/el/contributing/setup-development.md b/docs/src/el/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/el/contributing/setup-development.md
+++ b/docs/src/el/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/es/contributing/setup-development.md b/docs/src/es/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/es/contributing/setup-development.md
+++ b/docs/src/es/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/fr/contributing/setup-development.md b/docs/src/fr/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/fr/contributing/setup-development.md
+++ b/docs/src/fr/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/id/contributing/setup-development.md b/docs/src/id/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/id/contributing/setup-development.md
+++ b/docs/src/id/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/it/contributing/setup-development.md b/docs/src/it/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/it/contributing/setup-development.md
+++ b/docs/src/it/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/nl/contributing/setup-development.md b/docs/src/nl/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/nl/contributing/setup-development.md
+++ b/docs/src/nl/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/nn-NO/contributing/setup-development.md b/docs/src/nn-NO/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/nn-NO/contributing/setup-development.md
+++ b/docs/src/nn-NO/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/oc/contributing/setup-development.md b/docs/src/oc/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/oc/contributing/setup-development.md
+++ b/docs/src/oc/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/pl/contributing/setup-development.md b/docs/src/pl/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/pl/contributing/setup-development.md
+++ b/docs/src/pl/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/pt-BR/contributing/setup-development.md b/docs/src/pt-BR/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/pt-BR/contributing/setup-development.md
+++ b/docs/src/pt-BR/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/pt/contributing/setup-development.md b/docs/src/pt/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/pt/contributing/setup-development.md
+++ b/docs/src/pt/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/ru/contributing/setup-development.md b/docs/src/ru/contributing/setup-development.md
index 6aafb50b..7e42892a 100644
--- a/docs/src/ru/contributing/setup-development.md
+++ b/docs/src/ru/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/docs/src/sv/contributing/setup-development.md b/docs/src/sv/contributing/setup-development.md
index 1970e01e..b8f87717 100644
--- a/docs/src/sv/contributing/setup-development.md
+++ b/docs/src/sv/contributing/setup-development.md
@@ -43,7 +43,7 @@ to help you kickstart your contribution.
    app.forceGlobalSecureRequests=false
 
    app.baseURL="http://localhost:8080/"
-   app.mediaBaseURL="http://localhost:8080/"
+   media.baseURL="http://localhost:8080/"
 
    admin.gateway="cp-admin"
    auth.gateway="cp-auth"
diff --git a/modules/Install/Controllers/InstallController.php b/modules/Install/Controllers/InstallController.php
index a6270afe..bc876d99 100644
--- a/modules/Install/Controllers/InstallController.php
+++ b/modules/Install/Controllers/InstallController.php
@@ -167,7 +167,7 @@ class InstallController extends Controller
         $mediaBaseUrl = $this->request->getPost('media_base_url');
         self::writeEnv([
             'app.baseURL' => $baseUrl,
-            'app.mediaBaseURL' =>
+            'media.baseURL' =>
                 $mediaBaseUrl === '' ? $baseUrl : $mediaBaseUrl,
             'analytics.salt' => generate_random_salt(64),
             'admin.gateway' => $this->request->getPost('admin_gateway'),