diff --git a/roles/captiveportal/templates/checkurls b/roles/captiveportal/templates/checkurls
index ac61c1ac6..e71d4f375 100755
--- a/roles/captiveportal/templates/checkurls
+++ b/roles/captiveportal/templates/checkurls
@@ -15,8 +15,11 @@ teredo.ipv6.microsoft.com
 teredo.ipv6.microsoft.com.nsatc.net
 captive.apple.com
 init-p01st.push.apple.com
-mtalk.google.com
 connectivitycheck.android.com
-alt7-mtalk.google.com
+www.google.com
+mtalk.google.com
+alt4-mtalk.google.com
 alt6-mtalk.google.com
+alt7-mtalk.google.com
+people-pa.googleapis.com
 captive.lan
diff --git a/roles/captiveportal/templates/iiab-make-cp-servers.py b/roles/captiveportal/templates/iiab-make-cp-servers.py
index 743f27e70..fd0944190 100755
--- a/roles/captiveportal/templates/iiab-make-cp-servers.py
+++ b/roles/captiveportal/templates/iiab-make-cp-servers.py
@@ -4,7 +4,8 @@
 import os
 outstr = ''
 
-os.chdir('{{ iiab_dir }}/roles/captiveportal/templates')
+#os.chdir('{{ iiab_dir }}/roles/captiveportal/templates')
+os.chdir('/opt/iiab/iiab/roles/captiveportal/templates')
 with open('checkurls','r') as urls:
    for line in urls:
       line = line.replace('*','.*')