diff --git a/playbooks/mpdf.conf.j2 b/playbooks/mpdf.conf.j2
index 81b2ed5..9ea63ad 100644
--- a/playbooks/mpdf.conf.j2
+++ b/playbooks/mpdf.conf.j2
@@ -32,7 +32,8 @@ playlist_directory	 {{ [path,item,playlist_directory]|join() }}
 # MPD to accept files over ipc socket (using file:// protocol) or streaming
 # files over an accepted protocol.
 #
-db_file	     {{ db_file }}
+db_file	     {{ [path,item,db_file]|join() }}
+
 #
 # These settings are the locations for the daemon log files for the daemon.
 # These logs are great for troubleshooting, depending on your log_level
@@ -41,27 +42,27 @@ db_file	     {{ db_file }}
 # The special value "syslog" makes MPD use the local syslog daemon. This
 # setting defaults to logging to syslog, otherwise logging is disabled.
 #
-log_file		 {{ log_file }}
+log_file		 {{ [log_dir,item,log_file]|join() }}
 #
 # This setting sets the location of the file which stores the process ID
 # for use of mpd --kill and some init scripts. This setting is disabled by
 # default and the pid file will not be stored.
 #
-pid_file		{{ pid_file }}
+pid_file		{{ [path,item,pid_file]|join() }}
 #
 # This setting sets the location of the file which contains information about
 # most variables to get MPD back into the same general shape it was in before
 # it was brought down. This setting is disabled by default and the server
 # state will be reset on server start up.
 #
-state_file		{{ state_file }}
+state_file		{{ [path,item,state_file]|join() }}
 
 #
 # The location of the sticker database.  This is a database which
 # manages dynamic information attached to songs.
 #
-sticker_file                  {{ sticker_file }}
-#
+sticker_file                  {{ [path,item,sticker_file]|join() }}
+
 ###############################################################################
 
 
@@ -98,7 +99,7 @@ bind_to_address {{ bind_to_address }}
 # to.
 #
 #port				"6600"
-port {{ port }}
+port {{ port  + item }}
 
 #
 # This setting controls the type of information which is logged. Available
@@ -289,7 +290,7 @@ audio_output {
         enabled         "yes"
         name            "{{ stream }}"
         encoder         "lame"          # optional, vorbis or lame
-        port            "{{ port }}"
+        port            "{{ stream_port + item }}"
         bind_to_address "{{ bind_address }}"               # optional, IPv4 or IPv6
         quality         "3.0"                   # do not define if bitrate is defined
 #       bitrate         "128"                   # do not define if quality is defined
diff --git a/playbooks/mpdf.yaml b/playbooks/mpdf.yaml
index 9c30055..4f65527 100644
--- a/playbooks/mpdf.yaml
+++ b/playbooks/mpdf.yaml
@@ -14,7 +14,6 @@
     group: nogroup
     bind_to_address: any
     bind_address: any
-    port_start: 6600
     port: 6600
     log_level:
     gapless_mp3_playback: yes