diff --git a/assets/entrypoint-config.yml b/assets/entrypoint-config.yml
index 04798ad..3ad29ed 100644
--- a/assets/entrypoint-config.yml
+++ b/assets/entrypoint-config.yml
@@ -8,6 +8,7 @@ secret_env:
     - '*_PORTS'
     - '*_SERVICE_NAME'
     - '*_TOR_SERVICE_*'
+    - 'TOR_SOCKS_PORT'
 
 pre_conf_commands:
     - onions --setup-hosts
diff --git a/assets/torrc b/assets/torrc
index 3128362..97464a0 100644
--- a/assets/torrc
+++ b/assets/torrc
@@ -19,6 +19,10 @@ HiddenServicePort {{port.port_from}} {{service.host}}:{{port.dest}}
 ORPort 9001
 {% endif %}
 
+{% if 'TOR_SOCKS_PORT' in env %}
+SocksPort {{env['TOR_SOCKS_PORT']}}
+{% else %}
 SocksPort 0
+{% endif %}
 
 # useless line for Jinja bug