diff --git a/defaults/main.yml b/defaults/main.yml
index 40088cf..4abc91e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -43,7 +43,7 @@ smtp_server: mail.example.com
 smtp_port: 465
 smtp_password: "{{ vault_mastodon_admin_mail_password }}"
 
-
+allow_hidden_services: false
 #Use HTTP only for Vagrant testing or for reverse proxy purposes.
 use_http: true
 
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 7c3837b..f34e323 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -13,6 +13,7 @@ services:
       - ./postgres14:/var/lib/postgresql/data
     env_file: .env.production
 
+{% if allow_hidden_services %}
   tor:
     image: sirboops/tor
     networks:
@@ -27,6 +28,7 @@ services:
       - external_network
       - internal_network
 
+{% endif %}
   redis:
     restart: always
     image: redis:7-alpine
diff --git a/templates/env.j2 b/templates/env.j2
index 6e7cdcf..5c0c979 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -68,8 +68,10 @@ DB_PORT=5432
 REDIS_HOST={{ redis_host }}
 REDIS_PORT={{ redis_port }}
 
+{% if redis_volatile %}
 CACHE_REDIS_HOST={{ redis_cache_host }}
 CACHE_REDIS_PORT={{ redis_cache_port }}
+{% endif %}
 
 # elasticsearch
 ES_JAVA_OPTS=-Xms512m -Xmx512m
@@ -82,9 +84,11 @@ ES_PORT={{ es_port }}
 ES_USER={{ es_user }}
 ES_PASS={{ es_pass }}
 
+{% if allow_hidden_services %}
 # Tor
 http_proxy=http://privoxy:8118
 ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
+{% endif %}
 
 # IP and session retention
 # -----------------------