diff --git a/hosts b/hosts
index c5f147c..d51d431 100644
--- a/hosts
+++ b/hosts
@@ -1,9 +1,9 @@
 # list all of the raspberry PI devices in the network
 # the host name on each will be set to the first column
 # it can be 1-20 characters, letters, digits, and hyphens
-ned-host1 ansible_host=147.191.214.121
-ned-host2 ansible_host=192.168.88.217
-ned-host3 ansible_host=192.168.88.230
+ned-host1 ansible_host=192.168.88.217
+ned-host2 ansible_host=192.168.88.234
+ned-host3 ansible_host=192.168.88.218
 
 [ansible-hosts]
 # there must only be one ansible-host.  this is the device
@@ -16,6 +16,10 @@ ned-host1
 ned-host2
 ned-host3
 
+[pi:vars]
+vncpassword=vncpass99
+pipassword=pipassword99
+
 [samba-server]
 # it is best to have only one samba-server host
 ned-host1
diff --git a/roles/sipp/files/startclient.sh b/roles/sipp/files/startclient.sh
index 615693f..1e688dd 100644
--- a/roles/sipp/files/startclient.sh
+++ b/roles/sipp/files/startclient.sh
@@ -4,5 +4,5 @@ then
         echo "sipp is running"
 else
         cd /home/pi/sipp
-        ./sipp -sn uac_pcap 192.168.198.2 -bg -l 40
+        ./sipp -sn uac_pcap {{ hostvars[groups['sipserver'][0]].ansible_host }} -bg -l 40
 fi
diff --git a/roles/sipp/tasks/main.yaml b/roles/sipp/tasks/main.yaml
index d9130a8..de07e18 100644
--- a/roles/sipp/tasks/main.yaml
+++ b/roles/sipp/tasks/main.yaml
@@ -33,7 +33,7 @@
   tags: sipp
 - name: copy scripts
   when: sipp_move_directory is changed
-  copy:
+  template:
           src: "{{ item.src }}"
           dest: "{{ item.dest }}"
           owner: pi
@@ -45,7 +45,7 @@
           - { src: "{{ role_path }}/files/stopclient.sh", dest: "/home/pi/sipp/stopclient.sh" }
   tags: sipp
 - name: copy scripts2
-  copy:
+  template:
           src: "{{ item.src }}"
           dest: "{{ item.dest }}"
           owner: pi
diff --git a/roles/smbclient/files/smb-session.sh b/roles/smbclient/files/smb-session.sh
index 5242ebc..54922b9 100644
--- a/roles/smbclient/files/smb-session.sh
+++ b/roles/smbclient/files/smb-session.sh
@@ -13,6 +13,6 @@ if pgrep -f test_file >/dev/null
 then
         exit 0
 else
-	smbclient //192.168.88.230/share -c "get $file" -A ~/.credentials
+	smbclient //{{ hostvars[groups['samba-server'][0]].ansible_host }}/share -c "get $file" -A ~/.credentials
 fi
 
diff --git a/roles/smbclient/tasks/main.yaml b/roles/smbclient/tasks/main.yaml
index 445c96f..1b4ef92 100644
--- a/roles/smbclient/tasks/main.yaml
+++ b/roles/smbclient/tasks/main.yaml
@@ -8,7 +8,7 @@
           job: "/usr/bin/perl -e 'sleep int rand 3500' && /home/pi/scripts/smb-session.sh"
   tags: smbtraff_cron
 - name: copy smb-session.sh to scripts directory
-  copy:
+  template:
           src: "{{ role_path }}/files/smb-session.sh"
           dest: /home/pi/scripts/smb-session.sh
           owner: pi