diff --git a/.gitignore b/.gitignore
index 1377554ebea..eb3b49c883e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
+.idea/
diff --git a/playbooks/ec2.ini b/playbooks/ec2.ini
index 9a48f342bce..eec7f187bdf 100644
--- a/playbooks/ec2.ini
+++ b/playbooks/ec2.ini
@@ -1,6 +1,6 @@
 [ec2]
 regions=all
 destination_variable=public_dns_name
-vpc_destination_variable=ip_address
+vpc_destination_variable=private_ip_address
 cache_path=/tmp
 cache_max_age=300
diff --git a/playbooks/ec2.py b/playbooks/ec2.py
index 8cd3212eca9..0911d1237b2 100755
--- a/playbooks/ec2.py
+++ b/playbooks/ec2.py
@@ -378,7 +378,6 @@ def get_host_info(self):
     def push(self, my_dict, key, element):
         ''' Pushed an element onto an array that may not have been defined in
         the dict '''
-
         if key in my_dict:
             my_dict[key].append(element);
         else:
diff --git a/playbooks/keys/vik-sandbox.key b/playbooks/keys/vik-sandbox.key
new file mode 100644
index 00000000000..72156d6416b
--- /dev/null
+++ b/playbooks/keys/vik-sandbox.key
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBVxqB7lmP7A03jdQDsB
+FzSzHKPsAPHRzEZjfECR71P9gitm6ZsyYReoUwhSPDoYtkXFTlckG3Zc+4CVAuT7
+fecT/+JDcKmRrOZ+jXPn/6r0QboCBiBdEbe5BkA7i8X9dj9aW7/OM5VTR6+1k9kF
+IB+FVaNf9W+UbSncm5v0u9WRp+MBXaxZ/d2CfZT6Dv/NGVB9lp+HNMvDxeq60wrc
+aOgMDmTfl5s/NK30YiWOyeTD7tA+56oNOxvbZyYx4jDZLOE3N0xWK3wCNyG/LQ91
+6wG0TteF6NlV8lYfraTF6PNgFNOuD4u4q4NWgXZ5YFLnBo2mwueuSHiGQSou6z/S
+FwIDAQAB
+-----END PUBLIC KEY-----
\ No newline at end of file
diff --git a/playbooks/keys/vik.key b/playbooks/keys/vik.key
new file mode 100644
index 00000000000..bbd8fc13eb3
--- /dev/null
+++ b/playbooks/keys/vik.key
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLsSijLucpXK1PCvDucbPc6LTbvfUOQE6QJNFruGUgfYXsqyRNuLpIXtj54Btvm5bNc/lt+aCirJbYPmI1HjrUnPSxt3xsFT1+CzCdMQCVZLXHtb8dAo38Y8tSLEvB6G75Ty0GJySF2YR6OPvZSQwvsRPuLmBsvzENNxIm7kTxfETfPDkH/3h2YPgPgznRhGAWEG7Xl1lE8yH9Tnr0jhpJ1HoPgReWuZHLbIPpCrkR3xWYfESNyMjNmYrOJHICi+yF1fr8c7GTqulqMq2uxkofGE8c9TqLGOvLkPfFlkkz7OGGI+q6Qfy3BntlF7TOkj1HvMPyh8YoqnHxAiUCokWH vik.paruchuri@gmail.com
\ No newline at end of file
diff --git a/playbooks/mlapi_prod.yml b/playbooks/mlapi_prod.yml
new file mode 100644
index 00000000000..b8e5ea5c178
--- /dev/null
+++ b/playbooks/mlapi_prod.yml
@@ -0,0 +1,7 @@
+- hosts: tag_Group_mlapi_prod
+  vars_files:
+    - ["{{ secure_file_dir }}/mlapi_prod_vars.yml"]
+    - ["{{ secure_file_dir }}/users.yml"]
+    - ["{{ secure_file_dir }}/mlapi_prod_users.yml"]
+  roles:
+    - mlapi
diff --git a/playbooks/mlapi_sandbox.yml b/playbooks/mlapi_sandbox.yml
new file mode 100644
index 00000000000..e7355ac4cad
--- /dev/null
+++ b/playbooks/mlapi_sandbox.yml
@@ -0,0 +1,8 @@
+- hosts:
+    - tag_Group_mlapi_sandbox
+  vars_files:
+    - ["{{ secure_file_dir }}/mlapi_sandbox_vars.yml"]
+    - ["{{ secure_file_dir }}/users.yml"]
+    - ["{{ secure_file_dir }}/mlapi_sandbox_users.yml"]
+  roles:
+    - mlapi
diff --git a/playbooks/mlapi_stage.yml b/playbooks/mlapi_stage.yml
new file mode 100644
index 00000000000..51c42b1f433
--- /dev/null
+++ b/playbooks/mlapi_stage.yml
@@ -0,0 +1,7 @@
+- hosts: tag_Group_mlapi_stage
+  vars_files:
+    - ["{{ secure_file_dir }}/mlapi_stage_vars.yml"]
+    - ["{{ secure_file_dir }}/users.yml"]
+    - ["{{ secure_file_dir }}/mlapi_stage_users.yml"]
+  roles:
+    - mlapi
diff --git a/playbooks/roles/lms/tasks/main.yml b/playbooks/roles/lms/tasks/main.yml
index 54f388a980d..2ac73150772 100644
--- a/playbooks/roles/lms/tasks/main.yml
+++ b/playbooks/roles/lms/tasks/main.yml
@@ -32,3 +32,6 @@
   sudo: True
 - name: git checkout mitx repo into $app_base_dir
   git: dest=$app_base_dir/mitx repo=git@github.com:MITx/mitx.git
+- name: Update apt cache
+  sudo: True
+  apt: update_cache=yes
diff --git a/playbooks/roles/mlapi/tasks/main.yml b/playbooks/roles/mlapi/tasks/main.yml
new file mode 100644
index 00000000000..f92bb496102
--- /dev/null
+++ b/playbooks/roles/mlapi/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: create mlapi application config
+  template: src=env.json.j2 dest=$app_base_dir/env.json
+  sudo: True
+
+- name: create mlapi auth file
+  template: src=auth.json.j2 dest=$app_base_dir/auth.json
+  sudo: True
+
+# Check out mitx repo to $app_base_dir
+- name: set permissions on $app_base_dir sgid for edx
+  file: path=$app_base_dir owner=root group=edx mode=2775 state=directory
+  file: path=$app_base_dir owner=ubuntu group=edx mode=2775 state=directory
+  sudo: True
+- name: install git and its recommends
+  apt: pkg=git state=installed install_recommends=yes
+  sudo: True
+- name: git checkout ml-service-api repo into $app_base_dir
+  git: dest=$app_base_dir/ml-service-api repo=git@github.com:edx/ml-service-api.git
+- name: git checkout ml-service-api repo into $app_base_dir
+  git: dest=$app_base_dir/machine-learning repo=git@github.com:edx/machine-learning.git
diff --git a/playbooks/roles/mlapi/templates/auth.json.j2 b/playbooks/roles/mlapi/templates/auth.json.j2
new file mode 100644
index 00000000000..4f589aba58a
--- /dev/null
+++ b/playbooks/roles/mlapi/templates/auth.json.j2
@@ -0,0 +1 @@
+{{ auth_config | to_nice_json }}
\ No newline at end of file
diff --git a/playbooks/roles/mlapi/templates/env.json.j2 b/playbooks/roles/mlapi/templates/env.json.j2
new file mode 100644
index 00000000000..23f02af8ccf
--- /dev/null
+++ b/playbooks/roles/mlapi/templates/env.json.j2
@@ -0,0 +1 @@
+{{ env_config | to_nice_json }}
\ No newline at end of file