diff --git a/ansible/group_vars/sonic/vars b/ansible/group_vars/sonic/vars
index 21c24efa4e9..e7282eed497 100644
--- a/ansible/group_vars/sonic/vars
+++ b/ansible/group_vars/sonic/vars
@@ -29,6 +29,7 @@ syncd_docker_volumes: "{{ syncd_docker_volumes_dict.keys() }}"
 
 orchagent_docker_volumes_dict:
   "/etc/ssw/:/etc/ssw/:ro":
+  "/etc/sonic/:/etc/sonic/:ro":
   "/etc/network/interfaces:/etc/network/interfaces:ro":
   "/etc/network/interfaces.d/:/etc/network/interfaces.d/:ro":
   "/host/machine.conf:/host/machine.conf":
diff --git a/ansible/roles/sonic-common/tasks/lldp.yml b/ansible/roles/sonic-common/tasks/lldp.yml
index f8ed6258424..d4b92ffe00e 100644
--- a/ansible/roles/sonic-common/tasks/lldp.yml
+++ b/ansible/roles/sonic-common/tasks/lldp.yml
@@ -5,6 +5,8 @@
     docker_image: "{{ image_id_lldp }}"
     docker_privileged: yes
     docker_state: absent
+    docker_volumns:
+      - /etc/sonic/:/etc/sonic/:ro
 
 - name: switch LLDP image based on SONiC version
   set_fact:
@@ -18,6 +20,8 @@
     docker_image: "{{ image_id_lldp }}"
     docker_privileged: yes
     docker_state: reloaded
+    docker_volumns:
+      - /etc/sonic/:/etc/sonic/:ro
 
 - block:
   - name: Setup LLDPD Daemon Config File
diff --git a/ansible/roles/sonic-common/tasks/main.yml b/ansible/roles/sonic-common/tasks/main.yml
index aa20c4fd618..471cb5eab75 100644
--- a/ansible/roles/sonic-common/tasks/main.yml
+++ b/ansible/roles/sonic-common/tasks/main.yml
@@ -29,6 +29,16 @@
 - include: aptrepo.yml
   tags: repo
 
+- name: Ensure /etc/sonic path exists
+  file: path=/etc/sonic state=directory
+
+- name: Copy minigraph
+  become: true
+  copy: src=../minigraph/{{ inventory_hostname }}.xml
+        dest=/etc/sonic/minigraph.xml
+        mode=0644
+  tags: always
+  
 # Syslog
 - name: Install Syslog daemon
   become: true
diff --git a/ansible/roles/sonic-common/tasks/snmp.yml b/ansible/roles/sonic-common/tasks/snmp.yml
index 3f37cf298bb..d970300eb6e 100644
--- a/ansible/roles/sonic-common/tasks/snmp.yml
+++ b/ansible/roles/sonic-common/tasks/snmp.yml
@@ -6,6 +6,7 @@
     docker_privileged: yes
     docker_state: absent
     docker_volumes:
+      -  /etc/sonic/:/etc/sonic/:ro
       -  /etc/ssw/:/etc/ssw/:ro
 
 - name: switch SNMP image based on SONiC version
@@ -21,6 +22,7 @@
     docker_privileged: yes
     docker_state: reloaded
     docker_volumes:
+      -  /etc/sonic/:/etc/sonic/:ro
       -  /etc/ssw/:/etc/ssw/:ro
 
 - name: Gather setup facts about system
@@ -50,6 +52,11 @@
   connection: local
   register: snmp_remap
 
+- name: Copy snmp_rocommunity file
+  become: true
+  template: src=snmp.yml.j2
+            dest=/etc/sonic/snmp.yml
+            mode=0644
 
 - block:
   - name: Check version of snmpd
diff --git a/ansible/roles/sonic-common/templates/snmp.yml.j2 b/ansible/roles/sonic-common/templates/snmp.yml.j2
new file mode 100644
index 00000000000..bb510bc832e
--- /dev/null
+++ b/ansible/roles/sonic-common/templates/snmp.yml.j2
@@ -0,0 +1 @@
+snmp_rocommunity: {{ snmp_rocommunity }}
diff --git a/ansible/roles/sonicv2/tasks/quagga.yml b/ansible/roles/sonicv2/tasks/quagga.yml
index 0f48a37f192..d51437517c1 100644
--- a/ansible/roles/sonicv2/tasks/quagga.yml
+++ b/ansible/roles/sonicv2/tasks/quagga.yml
@@ -21,6 +21,8 @@
     docker_image: "{{ image_id_fpm }}"
     docker_privileged: yes
     docker_state: reloaded
+    docker_volumes:
+    - /etc/sonic/:/etc/sonic/:ro
     docker_volumes_from:
     - database
 
diff --git a/ansible/roles/sonicv2/tasks/teamd.yml b/ansible/roles/sonicv2/tasks/teamd.yml
index 4c965e0a176..e71835ca88e 100644
--- a/ansible/roles/sonicv2/tasks/teamd.yml
+++ b/ansible/roles/sonicv2/tasks/teamd.yml
@@ -5,6 +5,8 @@
     docker_image: "{{ image_id_teamd }}"
     docker_privileged: yes
     docker_state: reloaded
+    docker_volumes:
+    - /etc/sonic/:/etc/sonic/:ro
     docker_volumes_from:
     - database