diff --git a/.env b/.env
index 2344d9aba6..2affb9264b 100644
--- a/.env
+++ b/.env
@@ -37,7 +37,7 @@ _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
 _APP_STORAGE_S3_REGION=us-east-1
 _APP_STORAGE_S3_BUCKET=
-_APP_STORAGE_S3_ENDPOINT_URL=
+_APP_STORAGE_S3_ENDPOINT=
 _APP_STORAGE_DO_SPACES_ACCESS_KEY=
 _APP_STORAGE_DO_SPACES_SECRET=
 _APP_STORAGE_DO_SPACES_REGION=us-east-1
diff --git a/app/init.php b/app/init.php
index 55aa49bf5f..588daa3ff7 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1527,7 +1527,7 @@ function getDevice($root): Device
         $accessSecret = '';
         $bucket = '';
         $region = '';
-        $url = App::getEnv('_APP_STORAGE_S3_ENDPOINT_URL', '');
+        $url = App::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
 
         try {
             $dsn = new DSN($connection);
@@ -1568,7 +1568,7 @@ function getDevice($root): Device
                 $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
                 $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
                 $s3Acl = 'private';
-                $s3EndpointUrl = App::getEnv('_APP_STORAGE_S3_ENDPOINT_URL', '');
+                $s3EndpointUrl = App::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
                 return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl, $s3EndpointUrl);
             case Storage::DEVICE_DO_SPACES:
                 $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
diff --git a/docker-compose.yml b/docker-compose.yml
index bdea6d62f9..e0b21dae16 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,7 +139,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT_URL=
+      - _APP_STORAGE_S3_ENDPOINT=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -362,7 +362,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT_URL=
+      - _APP_STORAGE_S3_ENDPOINT=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION
@@ -462,7 +462,7 @@ services:
       - _APP_STORAGE_S3_SECRET
       - _APP_STORAGE_S3_REGION
       - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT_URL=
+      - _APP_STORAGE_S3_ENDPOINT=
       - _APP_STORAGE_DO_SPACES_ACCESS_KEY
       - _APP_STORAGE_DO_SPACES_SECRET
       - _APP_STORAGE_DO_SPACES_REGION