diff --git a/playbooks/local.yml b/playbooks/local.yml
index a7cc2d7e..be2ecc9f 100644
--- a/playbooks/local.yml
+++ b/playbooks/local.yml
@@ -1,16 +1,23 @@
 ---
 
 - name: Generate the SSH private key
-  local_action: shell echo -e  'n' | ssh-keygen -b 2048 -C {{ SSH_keys.comment }} -t rsa -f {{ SSH_keys.private }} -q -N ""
+  shell: >
+    echo -e  'n' |
+    ssh-keygen -b 2048 -C {{ SSH_keys.comment }}
+    -t rsa -f {{ SSH_keys.private }} -q -N ""
   args:
     creates: "{{ SSH_keys.private }}"
 
 - name: Generate the SSH public key
-  local_action: shell echo `ssh-keygen -y -f {{ SSH_keys.private }}` {{ SSH_keys.comment }} > {{ SSH_keys.public }}
+  shell: >
+    echo `ssh-keygen -y -f {{ SSH_keys.private }}` {{ SSH_keys.comment }}
+    > {{ SSH_keys.public }}
   changed_when: false
 
 - name: Change mode for the SSH private key
-  local_action: file path={{ SSH_keys.private }} mode=0600
+  file:
+    path: "{{ SSH_keys.private }}"
+    mode: 0600
 
 - name: Ensure the dynamic inventory exists
   blockinfile:
diff --git a/playbooks/local_ssh.yml b/playbooks/local_ssh.yml
index 05e53d9a..b2b30b77 100644
--- a/playbooks/local_ssh.yml
+++ b/playbooks/local_ssh.yml
@@ -1,14 +1,12 @@
 ---
 
 - name: Ensure the local ssh directory is exist
-  local_action:
-    module: file
-    path: "~/.ssh/"
+  file:
+    path: ~/.ssh/
     state: directory
 
 - name: Copy the algo ssh key to the local ssh directory
-  local_action:
-    module: copy
+  copy:
     src: "{{ SSH_keys.private }}"
     dest: ~/.ssh/algo.pem
     mode: '0600'
diff --git a/playbooks/post.yml b/playbooks/post.yml
index 3f1c1423..f9f41983 100644
--- a/playbooks/post.yml
+++ b/playbooks/post.yml
@@ -1,8 +1,7 @@
 ---
 
 - name: Wait until SSH becomes ready...
-  local_action:
-    module: wait_for
+  wait_for:
     port: 22
     host: "{{ cloud_instance_ip }}"
     search_regex: "OpenSSH"