diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 3b524e9e..58d024a5 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -77,8 +77,7 @@ def read_config(opts, config_file='config.py'):
     for k, v in config.items():
         if type(v) != str:
             continue
-        if v[0] == '$':
-            config[k] = os.environ[v[1:]]
+        config[k] = os.path.expandvars(v)
 
     # Check that commands and binaries do exist
     for key in ('mvn3', 'gradle'):