diff --git a/install/ansible/roles/installer/tasks/main.yml b/install/ansible/roles/installer/tasks/main.yml
index b5b7afa..cbf2206 100644
--- a/install/ansible/roles/installer/tasks/main.yml
+++ b/install/ansible/roles/installer/tasks/main.yml
@@ -2,25 +2,14 @@
   apt_repository:
     repo: 'ppa:ansible/ansible'
   tags: [installer]
+
 - name: Debian ansible is present
   apt:
     name: ansible
     state: latest
     force: yes
   tags: [installer]
-#- name: Installer files and directories are copied
-#  copy:
-#    src: "{{ cord_home }}/incubator/voltha/{{ item }}"
-#    dest: /home/vinstall
-#    owner: vinstall
-#    group: vinstall
-#    follow: no
-#  with_items:
-#    - install/installer.sh
-#    - install/install.cfg
-#    - install/ansible
-#    - compose
-#    - nginx_config
+
 - name: Installer files and directories are copied
   synchronize:
     src: "{{ cord_home }}/incubator/voltha/{{ item }}"
@@ -35,10 +24,9 @@
     - install/install.cfg
     - install/voltha-swarm-start.sh
     - install/voltha-swarm-stop.sh
+    - install/get-logs.sh
     - install/ansible
     - compose
-    - nginx_config
-    - envoy
   tags: [installer]
 
 - name: Determine if test mode is active
@@ -46,33 +34,41 @@
   local_action: stat path="{{ cord_home }}/incubator/voltha/install/.test"
   register: file
   ignore_errors: true
+
 - name: Test mode file is copied
   copy:
     src: "{{ cord_home }}/incubator/voltha/install/.test"
     dest: /home/vinstall
   when: file.stat.exists
+
 - name: The installer is made executable
   file:
     path: /home/vinstall/installer.sh
     mode: 0744
   tags: [installer]
+
 - name: Python docker-py {{ docker_py_version }} package source is available
   command: pip download -d /home/vinstall/docker-py "docker-py=={{ docker_py_version }}"
   tags: [installer]
+
 - name: Python netifaces {{ netifaces_version }} package source is available
   command: pip download -d /home/vinstall/netifaces "netifaces=={{ netifaces_version }}"
   tags: [installer]
+
 - name: Deb file directory doesn't exist
   file:
     path: /home/vinstall/deb_files
     state: absent
   tags: [installer]
+
 - name: Deb files are saved.
   command: cp -r /var/cache/apt/archives /home/vinstall
   tags: [installer]
+
 - name: Deb file directory is renamed
   command: mv /home/vinstall/archives /home/vinstall/deb_files
   tags: [installer]
+
 - name: Installer directories are owned by vinstall
   file:
     path: /home/vinstall/{{ item }}
@@ -83,13 +79,12 @@
   with_items:
     - ansible
     - compose
-    - nginx_config
     - .ansible
     - deb_files
     - docker-py
     - netifaces
-    - envoy
   tags: [installer]
+
 - name: Installer files are owned by vinstall
   file:
     path: /home/vinstall/{{ item }}
@@ -101,5 +96,6 @@
     - install.cfg
     - voltha-swarm-start.sh
     - voltha-swarm-stop.sh
+    - get-logs.sh
     - docker-compose-Linux-x86_64
   tags: [installer]
diff --git a/install/ansible/roles/voltha/tasks/main.yml b/install/ansible/roles/voltha/tasks/main.yml
index 76afee1..6852f82 100644
--- a/install/ansible/roles/voltha/tasks/main.yml
+++ b/install/ansible/roles/voltha/tasks/main.yml
@@ -43,9 +43,9 @@
   with_items:
     - compose
     - nginx_config
-    - envoy
     - voltha-swarm-start.sh
     - voltha-swarm-stop.sh
+    - get-logs.sh
   when: target == "cluster"
   tags: [voltha]
 
@@ -70,8 +70,6 @@
     follow: no
   with_items:
     - compose
-    - nginx_config
-    - envoy
   when: target == "cluster"
   tags: [voltha]
 
@@ -85,46 +83,27 @@
   with_items:
     - voltha-swarm-start.sh
     - voltha-swarm-stop.sh
+    - get-logs.sh
   when: target == "cluster"
   tags: [voltha]
 
-- name: Nginx statup script is executable
-  file:
-    path: "{{ target_voltha_dir }}/nginx_config/start_service.sh"
-    mode: 0755
-  when: target == "cluster"
-  tags: [voltha]
-
-#- name: Configuration files are on the cluster host
-#  copy:
-#    src: "files/consul_config"
-#    dest: "{{ target_voltha_dir }}"
-#    owner: voltha
-#    group: voltha
-#  when: target == "cluster"
-#  tags: [voltha]
-
 - name: Docker containers for Voltha are pulled
   command: docker pull {{ docker_registry }}/{{ item }}
   with_items: "{{ voltha_containers }}"
   when: target == "cluster"
   tags: [voltha]
+
 - name: Docker images are re-tagged to expected names
   command: docker tag {{ docker_registry }}/{{ item }} {{ item }}
   with_items: "{{ voltha_containers }}"
   when: target == "cluster"
   tags: [voltha]
+
 - name: Docker images are re-tagged to cluster registry names
   command: docker tag {{ docker_registry }}/{{ item }} {{ inventory_hostname }}:5001/{{ item }}
   with_items: "{{ voltha_containers }}"
   when: target == "cluster"
   tags: [voltha]
-#- name: Old docker image tags are removed
-#  command: docker rmi {{ docker_registry }}/{{ item }}
-#  with_items: "{{ voltha_containers }}"
-#  when: target == "cluster"
-#  tags: [voltha]
-
 
 # Update the insecure registry to reflect the current installer.
 # The installer name can change depending on whether test mode
@@ -150,11 +129,6 @@
   when: target == "installer"
   tags: [voltha]
 
-#- name: TEMPORARY RULE TO INSTALL ZOOKEEPER
-#  command: docker pull zookeeper
-#  when: target == "installer"
-#  tags: [voltha]
-
 - name: Docker images are re-tagged to registry for push
   command: docker tag {{ item }} {{ docker_push_registry }}/{{ item }}
   with_items: "{{ voltha_containers }}"