diff --git a/config-dist.php b/config-dist.php
index 7e03ce8e..4402f82b 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -1,5 +1,19 @@
 <?php
 
+# Settings can also be overwritten in two ways
+#
+# First priority
+# A .txt file with the same name as the setting in /data/settingoverrides
+# the content of the file is used as the setting value
+#
+# Second priority
+# An environment variable with the same name as the setting and prefix "GROCY_"
+# so for example "GROCY_BASE_URL"
+#
+# Third priority
+# The settings defined here below
+
+
 # Either "production", "dev" or "prerelease"
 Setting('MODE', 'production');
 
diff --git a/helpers/extensions.php b/helpers/extensions.php
index 06e11b85..109740f6 100644
--- a/helpers/extensions.php
+++ b/helpers/extensions.php
@@ -138,6 +138,10 @@ function Setting(string $name, $value)
 		{
 			define('GROCY_' . $name, file_get_contents($settingOverrideFile));
 		}
+		elseif (getenv('GROCY_' . $name) !== false) // An environment variable with the same name and prefix GROCY_ overwrites the given setting
+		{
+			define('GROCY_' . $name, getenv('GROCY_' . $name));
+		}
 		else
 		{
 			define('GROCY_' . $name, $value);