diff --git a/roles/tor_gateway/files/iptables.sh b/roles/tor_gateway/files/iptables.sh
new file mode 100644
index 0000000..f888d4c
--- /dev/null
+++ b/roles/tor_gateway/files/iptables.sh
@@ -0,0 +1,109 @@
+#
+
+### Set variables
+# The UID that Tor runs as (varies from system to system)
+#_tor_uid="109" #As per assumption
+_tor_uid=`id -u debian-tor` #Debian/Ubuntu
+#_tor_uid=`id -u tor` #ArchLinux/Gentoo
+
+# Tor's TransPort
+_trans_port="{{ tor_trans_port }}"
+
+# Tor's DNSPort
+_dns_port="{{ tor_dns_port }}"
+
+# Tor's VirtualAddrNetworkIPv4
+_virt_addr="10.192.0.0/10"
+
+# Your outgoing interface
+_out_if="{{ vm_net_interface_name }}"
+
+# LAN destinations that shouldn't be routed through Tor
+_non_tor="127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16"
+
+# Other IANA reserved blocks (These are not processed by tor and dropped by default)
+_resv_iana="0.0.0.0/8 100.64.0.0/10 169.254.0.0/16 192.0.0.0/24 192.0.2.0/24 192.88.99.0/24 198.18.0.0/15 198.51.100.0/24 203.0.113.0/24 224.0.0.0/4 240.0.0.0/4 255.255.255.255/32"
+
+### Don't lock yourself out after the flush
+#iptables -P INPUT ACCEPT
+#iptables -P OUTPUT ACCEPT
+
+### Flush iptables
+iptables -F
+iptables -t nat -F
+
+### *nat OUTPUT (For local redirection)
+# nat .onion addresses
+iptables -t nat -A OUTPUT -d $_virt_addr -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports $_trans_port
+
+# nat dns requests to Tor
+iptables -t nat -A OUTPUT -d 127.0.0.1/32 -p udp -m udp --dport 53 -j REDIRECT --to-ports $_dns_port
+
+# Don't nat the Tor process, the loopback, or the local network
+iptables -t nat -A OUTPUT -m owner --uid-owner $_tor_uid -j RETURN
+iptables -t nat -A OUTPUT -o lo -j RETURN
+
+# Allow lan access for hosts in $_non_tor
+for _lan in $_non_tor; do
+  iptables -t nat -A OUTPUT -d $_lan -j RETURN
+done
+
+for _iana in $_resv_iana; do
+  iptables -t nat -A OUTPUT -d $_iana -j RETURN
+done
+
+# Redirect all other pre-routing and output to Tor's TransPort
+iptables -t nat -A OUTPUT -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -j REDIRECT --to-ports $_trans_port
+
+### *filter INPUT
+# Don't forget to grant yourself ssh access from remote machines before the DROP.
+#iptables -A INPUT -i $_out_if -p tcp --dport 22 -m state --state NEW -j ACCEPT
+
+iptables -A INPUT -m state --state ESTABLISHED -j ACCEPT
+iptables -A INPUT -i lo -j ACCEPT
+
+# Allow INPUT from lan hosts in $_non_tor
+# Uncomment these 3 lines to enable.
+#for _lan in $_non_tor; do
+# iptables -A INPUT -s $_lan -j ACCEPT
+#done
+
+# Log & Drop everything else. Uncomment to enable logging
+#iptables -A INPUT -j LOG --log-prefix "Dropped INPUT packet: " --log-level 7 --log-uid
+iptables -A INPUT -j DROP
+
+### *filter FORWARD
+iptables -A FORWARD -j DROP
+
+### *filter OUTPUT
+iptables -A OUTPUT -m state --state INVALID -j DROP
+iptables -A OUTPUT -m state --state ESTABLISHED -j ACCEPT
+
+# Allow Tor process output
+iptables -A OUTPUT -o $_out_if -m owner --uid-owner $_tor_uid -p tcp -m tcp --tcp-flags FIN,SYN,RST,ACK SYN -m state --state NEW -j ACCEPT
+
+# Allow loopback output
+iptables -A OUTPUT -d 127.0.0.1/32 -o lo -j ACCEPT
+
+# Tor transproxy magic
+iptables -A OUTPUT -d 127.0.0.1/32 -p tcp -m tcp --dport $_trans_port --tcp-flags FIN,SYN,RST,ACK SYN -j ACCEPT
+
+# Allow OUTPUT to lan hosts in $_non_tor
+# Uncomment these 3 lines to enable.
+#for _lan in $_non_tor; do
+# iptables -A OUTPUT -d $_lan -j ACCEPT
+#done
+
+# Log & Drop everything else. Uncomment to enable logging
+#iptables -A OUTPUT -j LOG --log-prefix "Dropped OUTPUT packet: " --log-level 7 --log-uid
+iptables -A OUTPUT -j DROP
+
+### Set default policies to DROP
+iptables -P INPUT DROP
+iptables -P FORWARD DROP
+iptables -P OUTPUT DROP
+
+### Set default policies to DROP for IPv6
+#ip6tables -P INPUT DROP
+#ip6tables -P FORWARD DROP
+#ip6tables -P OUTPUT DROP
diff --git a/roles/tor_gateway/tasks/main.yml b/roles/tor_gateway/tasks/main.yml
index e23b1f3..60d9024 100644
--- a/roles/tor_gateway/tasks/main.yml
+++ b/roles/tor_gateway/tasks/main.yml
@@ -13,66 +13,25 @@
     name: iptables-persistent
     state: present
 
-- name: Forward IPv4 TCP traffic to TOR
+- name: set iptables rules
   become: yes
-  iptables:
-    ip_version: ipv4
-    table: nat
-    chain: PREROUTING
-    in_interface: "{{ vm_net_interface_name }}"
-    ctstate: NEW
-    protocol: tcp
-    jump: REDIRECT
-    to_ports: "{{ tor_trans_port }}"
+  script: iptables.sh
   notify: persist iptables
 
-- name: Forward IPv6 TCP traffic to TOR
-  become: yes
-  iptables:
-    ip_version: ipv6
-    table: nat
-    chain: PREROUTING
-    in_interface: "{{ vm_net_interface_name }}"
-    ctstate: NEW
-    protocol: tcp
-    jump: REDIRECT
-    to_ports: "{{ tor_trans_port }}"
-  notify: persist iptables
+- name: set nameserver to localhost
+  copy:
+    content: "nameserver 127.0.0.1"
+    dest: /etc/resolv.conf
 
-- name: Forward IPv4 DNS traffic to TOR
-  become: yes
-  iptables:
-    ip_version: ipv4
-    table: nat
-    chain: PREROUTING
-    in_interface: "{{ vm_net_interface_name }}"
-    protocol: udp
-    jump: REDIRECT
-    to_ports: "{{ tor_dns_port }}"
-  notify: persist iptables
+- name: Restart systemd-resolved
+  service:
+    name: systemd-resolved
+    state: restarted
+    daemon_reload: yes
 
-- name: Forward IPv6 DNS traffic to TOR
-  become: yes
-  iptables:
-    ip_version: ipv6
-    table: nat
-    chain: PREROUTING
-    in_interface: "{{ vm_net_interface_name }}"
-    protocol: udp
-    jump: REDIRECT
-    to_ports: "{{ tor_dns_port }}"
-  notify: persist iptables
-
-- name: Ensure log file exists
-  file:
-    path: "{{ tor_logfile_path }}"
-    state: touch
-    owner: debian-tor
-    mode: 0644
-
-- name: Start and enable tor service
+- name: (Re)start and enable tor service
   service:
     name: tor
-    state: started
+    state: restarted
     enabled: yes
     daemon_reload: yes
\ No newline at end of file
diff --git a/roles/tor_gateway/templates/torrc.j2 b/roles/tor_gateway/templates/torrc.j2
index 6136be6..428fd54 100644
--- a/roles/tor_gateway/templates/torrc.j2
+++ b/roles/tor_gateway/templates/torrc.j2
@@ -1,7 +1,6 @@
 Log notice file {{ tor_logfile_path }}
 VirtualAddrNetworkIPv4 10.192.0.0/10
 VirtualAddrNetworkIPv6: [fc00::]/7
-AutomapHostsSuffixes .onion,.exit
 AutomapHostsOnResolve 1
-TransPort {{ tor_trans_port }}
+TransPort {{ tor_trans_port }} IsolateClientAddr IsolateClientProtocol IsolateDestAddr IsolateDestPort
 DNSPort {{ tor_dns_port }}
\ No newline at end of file