diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index c5677dde1..f783a86c7 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -40,7 +40,7 @@ wondershaper_upspeed: "1024"
 
 # Wi-Fi
 host_ssid: IIAB
-hostapd_wait: 1
+hostapd_wait: 5
 host_wifi_mode: g
 host_channel: 6
 host_wireless_n: False
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index eb22b8e5a..fd9ee0d49 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -53,7 +53,7 @@
     creates: /etc/sysconfig/olpc-scripts/setup.d/installed/gateway
   when: iiab_network_mode == "Gateway"
 
-- name: Waiting {{ hostapd_wait }} seconds for network to stabilize
+- name: Waiting {{ hostapd_wait }} seconds for network to stabilize (iiap-gen-iptables will fail if dnsmasq isn't ready!)
   shell: sleep {{ hostapd_wait }}
 
 - name: Run /usr/bin/iiab-gen-iptables
diff --git a/scripts/ansible b/scripts/ansible
index 847a26219..5896773b6 100755
--- a/scripts/ansible
+++ b/scripts/ansible
@@ -71,8 +71,8 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
          > /etc/apt/sources.list.d/iiab-ansible.list
 
-    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367"\n'
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
+    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
 
     echo -e "\napt update; apt install ansible\n"
     apt update
diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x
index 54a673b72..4fa04cf6f 100755
--- a/scripts/ansible-2.6.x
+++ b/scripts/ansible-2.6.x
@@ -71,8 +71,8 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo "deb http://ppa.launchpad.net/ansible/ansible-2.6/ubuntu xenial main" \
          > /etc/apt/sources.list.d/iiab-ansible.list
 
-    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367"\n'
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
+    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
 
     echo -e "\napt update; apt install ansible\n"
     apt update
diff --git a/scripts/ansible-2.7.x b/scripts/ansible-2.7.x
index 1045a8d9c..462d23e92 100755
--- a/scripts/ansible-2.7.x
+++ b/scripts/ansible-2.7.x
@@ -71,8 +71,8 @@ elif [ -f /etc/debian_version ]; then    # Includes Debian, Ubuntu & Raspbian
     echo "deb http://ppa.launchpad.net/ansible/ansible-2.7/ubuntu xenial main" \
          > /etc/apt/sources.list.d/iiab-ansible.list
 
-    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367"\n'
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
+    echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n'
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367
 
     echo -e "\napt update; apt install ansible\n"
     apt update