diff --git a/templates/torrc.j2 b/templates/torrc.j2
index ab9fd85..a115376 100644
--- a/templates/torrc.j2
+++ b/templates/torrc.j2
@@ -1,7 +1,7 @@
-SocksPort {{ tor.listen.socks.addr }}:{{ tor.listen.socks.port }}
-SocksPolicy accept {{ tor.listen.socks.addr }}/24
+SocksPort {{ services.tor.listen.socks.addr }}:{{ services.tor.listen.socks.port }}
+SocksPolicy accept {{ services.tor.listen.socks.addr }}/8
 SocksPolicy reject *
-HTTPTunnelPort {{ tor.listen.http.addr }}:{{ tor.listen.http.port }}
+HTTPTunnelPort {{ services.tor.listen.http.addr }}:{{ services.tor.listen.http.port }}
 AvoidDiskWrites 1
 ClientOnly 1
 ConnectionPadding 1
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 485ce77..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-tor:
-        listen:
-                socks:
-                        addr: "127.0.0.1"
-                        port: "9050"
-                http:
-                        addr: "127.0.0.1"
-                        port: "7050"