diff --git a/Ansible/roles/router/files/dhcpd.conf b/Ansible/roles/router/files/dhcpd.conf
index 8596a9328456ef813e2380072cd03be9bba60d13..d143d9d698f976834f985bfdff0cc9664b1c17c4 100644
--- a/Ansible/roles/router/files/dhcpd.conf
+++ b/Ansible/roles/router/files/dhcpd.conf
@@ -27,4 +27,9 @@ subnet 192.168.3.0 netmask 255.255.255.0
     hardware ethernet C4:41:1E:AA:03:4A;
     fixed-address mr8300.shore.co.il;
   }
+  host nintendoswitch
+  {
+    hardware ethernet 70:f0:88:4c:c4:fe;
+    fixed-address NintendoSwitch;
+  }
 }
diff --git a/Ansible/roles/router/files/hosts b/Ansible/roles/router/files/hosts
index a9f8f9821cff9eb52e36689960091c9792b808d7..cc1fbbb66f5edb2004b71480f4e80fe3c5b486a2 100644
--- a/Ansible/roles/router/files/hosts
+++ b/Ansible/roles/router/files/hosts
@@ -4,3 +4,4 @@
 192.168.3.12 xbmc.shore.co.il xbmc kodi.shore.co.il kodi
 192.168.3.13 mr8300.shore.co.il mr8300
 192.168.3.17 host01.shore.co.il host01
+192.168.3.20 NintendoSwitch
diff --git a/Ansible/roles/router/files/pf.conf b/Ansible/roles/router/files/pf.conf
index e333daee456825c876448affadf923c8d5429bc4..26efdfbceb545491d8b0f91d751d205c185d65ee 100644
--- a/Ansible/roles/router/files/pf.conf
+++ b/Ansible/roles/router/files/pf.conf
@@ -49,6 +49,10 @@ pass in quick proto tcp to (egress:0) port { smtp, submission, imaps } rdr-to ho
 pass out quick proto tcp to host01.shore.co.il port { submission, smtp, imaps } received-on ingress nat-to ingress set prio ( 4, 6 )
 pass in quick proto { tcp, udp } to (egress:0) port bittorrent rdr-to kodi.shore.co.il set queue bulk set prio 1
 
+# Nintendo Switch
+pass in quick proto tcp to (egress:0) port {6667, 12400, 28910, 29900, 29901, 29920} rdr-to NintendoSwitch
+pass in quick proto udp to (egress:0) port 45000:65535 rdr-to NintendoSwitch
+
 # Allowed NAT and proxying
 #pass in quick on ingress inet proto tcp to egress:network port www divert-to localhost port wwwproxy
 pass in quick on ingress inet proto tcp to port ftp divert-to localhost port ftpproxy
diff --git a/Ansible/roles/router/files/unbound/shore.co.il.conf b/Ansible/roles/router/files/unbound/shore.co.il.conf
index 419f24b691a8adc7c7014dbb3f60c697dbb29338..31fb7933147dd3b930246f35703d96b9ea93648c 100644
--- a/Ansible/roles/router/files/unbound/shore.co.il.conf
+++ b/Ansible/roles/router/files/unbound/shore.co.il.conf
@@ -7,3 +7,4 @@ server:
     local-data: "mr8300.shore.co.il.        A   192.168.3.13"
     local-data: "host01.shore.co.il.        A   192.168.3.17"
     local-data: "smtp.shore.co.il.          A   192.168.3.17"
+    local-data: "nintendoswitch.            A   192.168.3.20"