diff --git a/ansible/jenkins-slave-vm.yml b/ansible/jenkins-slave-vm.yml
index 98e60cf65394177ab9fb5545aaf8ed61cc349617..7c8f334a76225b67d605cf41dd45c0212e3752fe 100644
--- a/ansible/jenkins-slave-vm.yml
+++ b/ansible/jenkins-slave-vm.yml
@@ -2,9 +2,10 @@
   become: yes
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml'] 
+  vars:
+       user: ops
   roles:
         - java8
         - maven
-        - docker
+        - docker-ce
         - common
-        - jenkins-slave-vm
diff --git a/ansible/roles/common/README.md b/ansible/roles/common/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0
--- /dev/null
+++ b/ansible/roles/common/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fa30550998ac91fc408e860e8dda8894b7987e23
--- /dev/null
+++ b/ansible/roles/common/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for common
\ No newline at end of file
diff --git a/ansible/roles/common/handlers/main.yml b/ansible/roles/common/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c6a8f0c7b91a9536b280b3d8a02f4002cee601b3
--- /dev/null
+++ b/ansible/roles/common/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for common
\ No newline at end of file
diff --git a/ansible/roles/common/meta/main.yml b/ansible/roles/common/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1964fc36c4d58f00e0e9937d3d0a888bf253795f
--- /dev/null
+++ b/ansible/roles/common/meta/main.yml
@@ -0,0 +1,56 @@
+galaxy_info:
+  author: Rajesh Rajendran
+  company: Optit
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..294d15447c119061a09a2658ca1dd2d6f8979389
--- /dev/null
+++ b/ansible/roles/common/tasks/main.yml
@@ -0,0 +1,24 @@
+---
+- name: Installing common packages
+  apt:
+    name: "{{item}}"
+    state: latest
+  with_items:
+    - zip
+    - unzip
+    - curl
+    - python-pip
+- name: Installing ansible
+  pip:
+    name: ansible
+    version: 2.3
+- name: configuring slave
+  shell: |
+    wget -q https://repo.jenkins-ci.org/releases/org/jenkins-ci/plugins/swarm-client/3.3/swarm-client-3.3.jar
+    sudo nohup java -jar swarm-client-3.3.jar -username "{{jenkins_admin_username}}" -password "{{jenkins_admin_password}}" -master http://10.20.0.4:8080/jenkins/ -labels build-slave-test -executors 2 &
+    touch ~/vault_pass
+- name: adding password
+  lineinfile:
+    path: ~/vault_pass
+    line: "{{vault_docker_hub}}"
+    state: present
diff --git a/ansible/roles/common/tests/inventory b/ansible/roles/common/tests/inventory
new file mode 100644
index 0000000000000000000000000000000000000000..878877b0776c44f55fc4e458f70840f31da5bb01
--- /dev/null
+++ b/ansible/roles/common/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/ansible/roles/common/tests/test.yml b/ansible/roles/common/tests/test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8d24282dae9c71c1d1c2783e27a39e14ecf89068
--- /dev/null
+++ b/ansible/roles/common/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - common
\ No newline at end of file
diff --git a/ansible/roles/common/vars/main.yml b/ansible/roles/common/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..feaa92f9b64b5de2d1c31d15e97025e42a34a015
--- /dev/null
+++ b/ansible/roles/common/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for common
\ No newline at end of file
diff --git a/ansible/roles/docker-ce/README.md b/ansible/roles/docker-ce/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0
--- /dev/null
+++ b/ansible/roles/docker-ce/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ansible/roles/docker-ce/defaults/main.yml b/ansible/roles/docker-ce/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7f18c9467fb6bb3301fc6bac590babb308519dcb
--- /dev/null
+++ b/ansible/roles/docker-ce/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for docker-ce
\ No newline at end of file
diff --git a/ansible/roles/docker-ce/handlers/main.yml b/ansible/roles/docker-ce/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6f7034c09588b84c501bf77cb874227625c42349
--- /dev/null
+++ b/ansible/roles/docker-ce/handlers/main.yml
@@ -0,0 +1,6 @@
+---
+- name: restart docker
+  service:
+    name: docker
+    state: restarted
+  become: true
diff --git a/ansible/roles/docker-ce/meta/main.yml b/ansible/roles/docker-ce/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..14dab648e86895e6ee4df8f6cede5d0872dec52c
--- /dev/null
+++ b/ansible/roles/docker-ce/meta/main.yml
@@ -0,0 +1,56 @@
+galaxy_info:
+  author: Rajesh Rajendran
+  company: OptIt
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/ansible/roles/docker-ce/tasks/apt.yml b/ansible/roles/docker-ce/tasks/apt.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6fffb9c0a22969a1aa9f72d7eaeba869b7cf50bc
--- /dev/null
+++ b/ansible/roles/docker-ce/tasks/apt.yml
@@ -0,0 +1,48 @@
+---
+- name: Remove previous version
+  apt:
+    name: '{{ item }}'
+    state: removed
+    force: yes
+    update_cache: yes
+    cache_valid_time: 3600
+  with_items:
+    - docker
+    - docker-engine
+    - docker.io
+  become: true
+
+- name: Determine revision
+  shell: "echo -n `uname -r`"
+  register: revision
+
+- name: Determine release
+  shell: lsb_release -a 2>/dev/null | grep Codename | awk '{printf("%s"), $2}'
+  register: release
+
+- name: Install dependencies for Ubuntu
+  apt:
+    name: '{{ item }}'
+    state: installed
+    force: yes
+    update_cache: yes
+    cache_valid_time: 3600
+  with_items:
+    - apt-transport-https
+    - ca-certificates
+    - curl
+    - software-properties-common
+    - linux-image-extra-virtual
+    - linux-image-extra-{{ revision.stdout }}
+  become: true
+
+- name: Add key
+  raw: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+
+- name: Add docker repository
+  become: true
+  lineinfile:
+    line: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ release.stdout }} stable"
+    dest: /etc/apt/sources.list.d/docker.list
+    state: present
+    create: yes
diff --git a/ansible/roles/docker-ce/tasks/main.yml b/ansible/roles/docker-ce/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1f00d9814e912d65e2fe213bc55d5b445f382260
--- /dev/null
+++ b/ansible/roles/docker-ce/tasks/main.yml
@@ -0,0 +1,14 @@
+- name: Including apt
+  include: apt.yml
+
+- name: Install docker-ce APT
+  apt:
+    name: '{{ item }}'
+    state: installed
+    force: yes
+    update_cache: yes
+    cache_valid_time: 0
+  with_items:
+      - docker-ce
+  become: true
+  notify: restart docker
diff --git a/ansible/roles/docker-ce/tests/inventory b/ansible/roles/docker-ce/tests/inventory
new file mode 100644
index 0000000000000000000000000000000000000000..878877b0776c44f55fc4e458f70840f31da5bb01
--- /dev/null
+++ b/ansible/roles/docker-ce/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/ansible/roles/docker-ce/tests/test.yml b/ansible/roles/docker-ce/tests/test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..67ddb806712bec366093e7809c0c0a7a9104cdd8
--- /dev/null
+++ b/ansible/roles/docker-ce/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - docker-ce
\ No newline at end of file
diff --git a/ansible/roles/docker-ce/vars/main.yml b/ansible/roles/docker-ce/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..33e91e8d5e112ada21a1d0ca4cf8e6fe66ed9c96
--- /dev/null
+++ b/ansible/roles/docker-ce/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for docker-ce
\ No newline at end of file
diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
index 02936ece694c2519e442e5700c74d27140c6d484..cc70d2128d3980cc768ea1ba3cb427ed96284cfb 100644
--- a/ansible/roles/kong-api/defaults/main.yml
+++ b/ansible/roles/kong-api/defaults/main.yml
@@ -1769,7 +1769,7 @@ kong_apis:
       config.allowed_payload_size: '{{ medium_request_size_limit }}'
   - name: getAnnouncementDefinitions
     request_path: '{{announcement_service_prefix}}/v1/definitions'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/definitions'
+    upstream_url: '{{ player_service_url }}/announcement/v1/definitions'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -1784,7 +1784,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: createAnnouncement
     request_path: '{{announcement_service_prefix}}/v1/create'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/create'
+    upstream_url: '{{ player_service_url }}/announcement/v1/create'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -1797,39 +1797,9 @@ kong_apis:
       config.limit_by: credential
     - name: request-size-limiting
       config.allowed_payload_size: '{{ small_request_size_limit }}'
-  - name: uploadAnnouncementAttachment
-    request_path: '{{announcement_service_prefix}}/v1/attachment/upload'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/attachment/upload'
-    strip_request_path: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - '{{ statsd_pulgin }}'
-    - name: acl
-      config.whitelist: dataAdmin
-    - name: rate-limiting
-      config.hour: '{{ medium_rate_limit_per_hour }}'
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: '{{ small_request_size_limit }}'
-  - name: downloadAnnouncementAttachment
-    request_path: '{{announcement_service_prefix}}/v1/attachment/download'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/attachment/download'
-    strip_request_path: true
-    plugins:
-    - name: jwt
-    - name: cors
-    - '{{ statsd_pulgin }}'
-    - name: acl
-      config.whitelist: publicUser
-    - name: rate-limiting
-      config.hour: '{{ medium_rate_limit_per_hour }}'
-      config.limit_by: credential
-    - name: request-size-limiting
-      config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: cancelAnnouncement
     request_path: '{{announcement_service_prefix}}/v1/cancel'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/cancel'
+    upstream_url: '{{ player_service_url }}/announcement/v1/cancel'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -1844,7 +1814,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: getAnnouncementInbox
     request_path: '{{announcement_service_prefix}}/v1/user/inbox'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/user/inbox'
+    upstream_url: '{{ player_service_url }}/announcement/v1/user/inbox'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -1859,7 +1829,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: getAnnouncementOutbox
     request_path: '{{announcement_service_prefix}}/v1/user/outbox'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/user/outbox'
+    upstream_url: '{{ player_service_url }}/announcement/v1/user/outbox'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -1874,7 +1844,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: getAnnouncement
     request_path: '{{announcement_service_prefix}}/v1/get'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/get'
+    upstream_url: '{{ player_service_url }}/announcement/v1/get'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -2085,7 +2055,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'  
   - name: announcementResend
     request_path: '{{ announcement_service_prefix }}/v1/resend'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/resend'
+    upstream_url: '{{ player_service_url }}/announcement/v1/resend'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -2100,7 +2070,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: announcementReceived
     request_path: '{{ announcement_service_prefix }}/v1/received'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/received'
+    upstream_url: '{{ player_service_url }}/announcement/v1/received'
     strip_request_path: true
     plugins:
     - name: jwt
@@ -2115,7 +2085,7 @@ kong_apis:
       config.allowed_payload_size: '{{ small_request_size_limit }}'
   - name: announcementRead
     request_path: '{{ announcement_service_prefix }}/v1/read'
-    upstream_url: '{{ player_service_url }}/api/v1/announcement/read'
+    upstream_url: '{{ player_service_url }}/announcement/v1/read'
     strip_request_path: true
     plugins:
     - name: jwt
diff --git a/ansible/roles/maven/README.md b/ansible/roles/maven/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..225dd44b9fc5b3abff7e9c68ff9e91d505cdd5f0
--- /dev/null
+++ b/ansible/roles/maven/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ansible/roles/maven/defaults/main.yml b/ansible/roles/maven/defaults/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..49af7b8199c452764d758aec315a4c8e23d046c6
--- /dev/null
+++ b/ansible/roles/maven/defaults/main.yml
@@ -0,0 +1,6 @@
+---
+#Maven vars
+maven_major: 3
+maven_version: 3.3.9
+maven_home_parent_directory: /opt
+maven_env_file: "/etc/profile.d/maven.sh"
diff --git a/ansible/roles/maven/handlers/main.yml b/ansible/roles/maven/handlers/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a327a40e92665546130ff18be261bf639a687150
--- /dev/null
+++ b/ansible/roles/maven/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for maven
\ No newline at end of file
diff --git a/ansible/roles/maven/meta/main.yml b/ansible/roles/maven/meta/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1964fc36c4d58f00e0e9937d3d0a888bf253795f
--- /dev/null
+++ b/ansible/roles/maven/meta/main.yml
@@ -0,0 +1,56 @@
+galaxy_info:
+  author: Rajesh Rajendran
+  company: Optit
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+
+  min_ansible_version: 1.2
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  # Optionally specify the branch Galaxy will use when accessing the GitHub
+  # repo for this role. During role install, if no tags are available,
+  # Galaxy will use this branch. During import Galaxy will access files on
+  # this branch. If Travis integration is configured, only notifications for this
+  # branch will be accepted. Otherwise, in all cases, the repo's default branch
+  # (usually master) will be used.
+  #github_branch:
+
+  #
+  # platforms is a list of platforms, and each platform has a name and a list of versions.
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/ansible/roles/maven/tasks/main.yml b/ansible/roles/maven/tasks/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3a30bb8f87241db2e15d760c3b66e1ff26c30433
--- /dev/null
+++ b/ansible/roles/maven/tasks/main.yml
@@ -0,0 +1,39 @@
+---
+
+# Ansible role to install apache maven 3
+
+  - name: Check If maven is already installed or not
+    shell: "mvn -version | grep -w 'Apache Maven' | awk '{print $3}'"
+    register: maven_installed
+ 
+  - name: Installed maven version
+    debug: "msg={{maven_installed.stdout}}"
+
+  - block:
+    - name: Download and Unarchive maven
+      unarchive:
+        src: "http://www.apache.org/dist/maven/maven-{{ maven_major }}/{{ maven_version }}/binaries/apache-maven-{{ maven_version }}-bin.tar.gz"
+        dest: "{{maven_home_parent_directory}}"
+        copy: no
+
+    - name: Create maven symlink to /usr/bin
+      file:
+        src: "{{maven_home_parent_directory}}/apache-maven-{{maven_version}}/bin/mvn"
+        dest: /usr/bin/mvn
+        state: link
+
+    - name: Configure maven and its environment variables
+      lineinfile:
+        dest: "{{maven_env_file}}"
+        line: "{{ item.line }}"
+        create: yes
+        state: present
+      with_items:
+        - { line: 'M2_HOME={{maven_home_parent_directory}}/apache-maven-{{maven_version}}' }
+        - { line: 'PATH=$PATH:$M2_HOME/bin' }
+   
+    - name: Exports/Run maven env file for make M2_HOME available globally
+      become_user: "{{user}}"
+      raw: "source {{maven_env_file}}"
+
+    when: maven_installed.stdout == ""
diff --git a/ansible/roles/maven/tests/inventory b/ansible/roles/maven/tests/inventory
new file mode 100644
index 0000000000000000000000000000000000000000..878877b0776c44f55fc4e458f70840f31da5bb01
--- /dev/null
+++ b/ansible/roles/maven/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/ansible/roles/maven/tests/test.yml b/ansible/roles/maven/tests/test.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f36f54264af8c936a6f8fd2be6b339c290b408ca
--- /dev/null
+++ b/ansible/roles/maven/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - maven
\ No newline at end of file
diff --git a/ansible/roles/maven/vars/main.yml b/ansible/roles/maven/vars/main.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4bdb88106dd9ed787bb92eb60b31c9bfe156635b
--- /dev/null
+++ b/ansible/roles/maven/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for maven
\ No newline at end of file
diff --git a/cloud/azure/arm/swarm/acs-engine/common/azuredeploy.json b/cloud/azure/arm/swarm/acs-engine/common/azuredeploy.json
index cc8f63db2a9c7bbe2fb5d512115b682748b244d5..1c30118134ceebf5951c87ffd921dd4a0ee5d45e 100644
--- a/cloud/azure/arm/swarm/acs-engine/common/azuredeploy.json
+++ b/cloud/azure/arm/swarm/acs-engine/common/azuredeploy.json
@@ -516,7 +516,7 @@
       "osImagePublisher": "Canonical",
       "osImageSKU": "16.04-LTS",
       "osImageVersion": "16.04.201706191",
-      "postInstallScriptURI": "disabled",
+      "postInstallScriptURI": "https://raw.githubusercontent.com/project-sunbird/sunbird-devops/master/deploy/docker-swam-node-post-install.sh",
       "sshKeyPath": "[concat('/home/', variables('adminUsername'), '/.ssh/authorized_keys')]",
       "sshRSAPublicKey": "[parameters('sshRSAPublicKey')]",
       "storageAccountBaseName": "",
diff --git a/deploy/docker-swam-node-post-install.sh b/deploy/docker-swam-node-post-install.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fc461cbf1e6aa2d2286a9fbe01e6a8cbf769d0a9
--- /dev/null
+++ b/deploy/docker-swam-node-post-install.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+
+# This is to ensure we don't get below error
+# Failed to start container manager: inotify_init: too many open files
+# Reference: https://github.com/moby/moby/issues/1044
+sysctl -w fs.inotify.max_user_instances=8192
\ No newline at end of file