diff --git a/group_vars/personal/mpd.yml b/group_vars/personal/mpd.yml
index 258ec66..f28520a 100644
--- a/group_vars/personal/mpd.yml
+++ b/group_vars/personal/mpd.yml
@@ -1,9 +1,9 @@
-mpd_listen_address: '127.0.0.1'
-mpd_listen_port: '6600'
+mpd_listen_address: 127.0.0.1
+mpd_listen_port: 6600
 
-mpd_remote_address: 'vpn.{{ server_domain }}'
-mpd_remote_port: '21000'
-mpd_remote_stream_port: '8000' # note that this is not used (yet)
+mpd_remote_address: 'mpd.{{ server_domain }}'
+mpd_remote_port: 21000
+mpd_remote_stream_port: 8000
 
 mpd_configuration_dir: '{{ ansible_env.HOME }}/.config/mpd'
 ncmpc_configuration_dir: '{{ ansible_env.HOME }}/.config/ncmpc'
diff --git a/host_vars/desktop/vpn.yml b/host_vars/desktop/vpn.yml
index 49fc629..dc04880 100644
--- a/host_vars/desktop/vpn.yml
+++ b/host_vars/desktop/vpn.yml
@@ -9,6 +9,7 @@ vpn_default:
     - 'transmission.{{ server_domain }}'
     - 'syncthing.{{ server_domain }}'
     - 'radicale.{{ server_domain }}'
+    - 'mpd.{{ server_domain }}'
 
   public_key_path: '{{ vpn_config_dir }}/keys/public/default/desktop.pub'
   private_key_path: '{{ vpn_config_dir }}/keys/private/default/desktop.key'
@@ -20,6 +21,7 @@ vpn_default:
         - 172.16.238.0/24
         - 172.32.238.0/24
         - 172.64.238.0/24
+        - 172.128.238.0/24
       endpoint: '{{ server_domain }}:51902'
       public_key: CeybSMpJiicXmndIuhe89Bay3z3PEdYNyAwIFsacBEo=
       preshared_key_path: '{{ vpn_config_dir }}/keys/private/default/preshared-zeus.psk'
diff --git a/host_vars/xps/vpn.yml b/host_vars/xps/vpn.yml
index 6951d94..cd9d2ea 100644
--- a/host_vars/xps/vpn.yml
+++ b/host_vars/xps/vpn.yml
@@ -11,6 +11,7 @@ vpn_default:
     - 'transmission.{{ server_domain }}'
     - 'syncthing.{{ server_domain }}'
     - 'radicale.{{ server_domain }}'
+    - 'mpd.{{ server_domain }}'
 
   public_key_path: '{{ vpn_config_dir }}/keys/public/default/laptop.pub'
   private_key_path: '{{ vpn_config_dir }}/keys/private/default/laptop.key'
@@ -22,6 +23,7 @@ vpn_default:
         - 172.16.238.0/24
         - 172.32.238.0/24
         - 172.64.238.0/24
+        - 172.128.238.0/24
       endpoint: '{{ server_domain }}:51902'
       public_key: 'CeybSMpJiicXmndIuhe89Bay3z3PEdYNyAwIFsacBEo='
       preshared_key_path: '{{ vpn_config_dir }}/keys/private/default/preshared-zeus.psk'
diff --git a/templates/personal/all/mpd/ncmpcpp/config.j2 b/templates/personal/all/mpd/ncmpcpp/config.j2
index 865a549..a7cc08a 100644
--- a/templates/personal/all/mpd/ncmpcpp/config.j2
+++ b/templates/personal/all/mpd/ncmpcpp/config.j2
@@ -3,10 +3,10 @@
 
 ############## Connection ###################
 ## Connect to mpd running on a specified host
-mpd_host = 10.0.0.1
+mpd_host = {{ mpd_remote_address }}
 
 ## Connect to mpd on the specified port.
-mpd_port = 21000
+mpd_port = {{ mpd_remote_port }}
 
 # header_visibility = yes
 # playlist_show_mpd_host = yes