diff --git a/templates/mpd.j2 b/templates/mpd.j2
index 30f09e1..5e38d79 100644
--- a/templates/mpd.j2
+++ b/templates/mpd.j2
@@ -93,13 +93,19 @@ input {
 # blocks. Setting this block is optional, though the server will only attempt
 # autodetection for one sound card.
 #
-{% for peer, properties in vpn_peers.items() %}
+
 audio_output {
-	type		"pulse"
-	name		"Pulse remote {{ peer }}"
-	server		"{{ properties.ip }}"
+       type            "httpd"
+       name            "HTTP Stream"
+       encoder         "opus"
+       port            "{{ mpd_http_stream_port }}"
+       bind_to_address "{{ vpn_listen_address }}"
+       bitrate         "128000"
+       format          "48000:16:1"
+       always_on       "yes"
+       max_clients     "0"                     # optional 0=no limit
 }
-{% endfor %}
+
 
 #
 # Character Encoding ##########################################################
diff --git a/templates/nftables.j2 b/templates/nftables.j2
index a9caaa0..8ffe6d3 100644
--- a/templates/nftables.j2
+++ b/templates/nftables.j2
@@ -30,5 +30,6 @@ table ip filter {
     iifname "{{ vpn_interface }}" tcp dport {{ transmission_web_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "Transmission Web"
     iifname "{{ vpn_interface }}" tcp dport { {{ syncthing_gui_port }}, {{ syncthing_protocol_port }} } ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "Syncthing"
     iifname "{{ vpn_interface }}" tcp dport {{ mpd_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "MPD"
+    iifname "{{ vpn_interface }}" tcp dport {{ mpd_http_stream_port }} ip saddr {{ vpn_source_range }} ip daddr {{ vpn_destination_range }} accept comment "MPD HTTP stream"
   }
 }
diff --git a/templates/syncthing.j2 b/templates/syncthing.j2
index 687f0b3..a30f46c 100644
--- a/templates/syncthing.j2
+++ b/templates/syncthing.j2
@@ -1,5 +1,6 @@
 <!-- {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }} -->
 
+<!-- TODO: update syncthing client IP's. These should be set to their VPN ip addresses (e.g. 10.0.0.x) instead of dynamic -->
 <configuration version="32">
 <folder id="Pictures" label="Pictures" path="{{ syncthing_picture_folder }}" type="sendreceive" rescanIntervalS="60" fsWatcherEnabled="false" fsWatcherDelayS="10" ignorePerms="false" autoNormalize="true">
         <filesystemType>basic</filesystemType>
diff --git a/vars/network.yml b/vars/network.yml
index 2a214ce..6d02645 100644
--- a/vars/network.yml
+++ b/vars/network.yml
@@ -10,17 +10,19 @@ https_port: 443
 ssh_port: 39901
 
 mpd_port: 21000
-nfs_port: 2049
+mpd_http_stream_port: 8000
 
 gitlab_ip: '127.0.0.1'
 gitlab_port: '9090'
+gitlab_ssh_port: '22'
 
 newsreader_ip: '192.168.178.63'
 
 sentry_ip: '127.0.0.1'
 sentry_port: '9000'
 
-gitlab_ssh_port: '22'
+syncthing_gui_port: 8384
+syncthing_protocol_port: 22000
 
 radicale_listen_addres: '127.0.0.1'
 radicale_port: 5232
diff --git a/vars/syncthing.yml b/vars/syncthing.yml
index 387c4c8..93e6e24 100644
--- a/vars/syncthing.yml
+++ b/vars/syncthing.yml
@@ -1,5 +1,2 @@
-syncthing_gui_port: 8384
-syncthing_protocol_port: 22000
-
 syncthing_file_folder: '{{ ansible_env.HOME }}/files/Sync/'
 syncthing_picture_folder: '{{ ansible_env.HOME }}/files/Pictures/'