diff --git a/provisioner/Dockerfile.provisioner b/provisioner/Dockerfile.provisioner
index d53b7ee..cfc8850 100644
--- a/provisioner/Dockerfile.provisioner
+++ b/provisioner/Dockerfile.provisioner
@@ -20,7 +20,7 @@
 ADD . /go/src/gerrit.opencord.org/maas/cord-provisioner
 RUN go build -o /build/entry-point gerrit.opencord.org/maas/cord-provisioner
 
-FROM alpine:3.5
+FROM alpine:3.6
 MAINTAINER Open Networking Laboratory <info@onlab.us>
 
 # Base image information borrowed by official golang wheezy Dockerfile
diff --git a/roles/compute-node/tasks/networking.yml b/roles/compute-node/tasks/networking.yml
index 6411335..37b9617 100644
--- a/roles/compute-node/tasks/networking.yml
+++ b/roles/compute-node/tasks/networking.yml
@@ -410,7 +410,10 @@
     - reboot
 
 - name: Wait For Restart
-  local_action: wait_for port={{ ansible_port | default('22') }} host={{ inventory_hostname }} search_regex=OpenSSH delay=120 timeout=600 connect_timeout=15
+  wait_for_connection:
+    delay: 120
+    timeout: 600
+    connect_timeout: 15
   when: reboot_required
   tags:
     - interface_config