diff --git a/playbooks/roles/edxlocal/tasks/main.yml b/playbooks/roles/edxlocal/tasks/main.yml
index a3e825d..2cb40de 100644
--- a/playbooks/roles/edxlocal/tasks/main.yml
+++ b/playbooks/roles/edxlocal/tasks/main.yml
@@ -90,25 +90,25 @@
     db={{ item }}
     state=present
     encoding=utf8
-  when: ANALYTICS_API_CONFIG is defined
+  when: ANALYTICS_API_SERVICE_CONFIG is defined
   with_items:
-    - "{{ ANALYTICS_API_CONFIG['DATABASES']['default']['NAME'] }}"
-    - "{{ ANALYTICS_API_CONFIG['DATABASES']['reports']['NAME'] }}"
+    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['default']['NAME'] }}"
+    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['reports']['NAME'] }}"
 
 
 - name: create api user for the analytics api
   mysql_user: >
     name=api001
     password=password
-    priv='{{ ANALYTICS_API_CONFIG['DATABASES']['default']['NAME'] }}.*:ALL/reports.*:SELECT'
-  when: ANALYTICS_API_CONFIG is defined
+    priv='{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['default']['NAME'] }}.*:ALL/reports.*:SELECT'
+  when: ANALYTICS_API_SERVICE_CONFIG is defined
 
 - name: create read-only reports user for the analytics-api
   mysql_user: >
     name=reports001
     password=password
-    priv='{{ ANALYTICS_API_CONFIG['DATABASES']['reports']['NAME'] }}.*:SELECT'
-  when: ANALYTICS_API_CONFIG is defined
+    priv='{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['reports']['NAME'] }}.*:SELECT'
+  when: ANALYTICS_API_SERVICE_CONFIG is defined
 
 - name: setup the edx-notes-api db user
   mysql_user: >
@@ -136,18 +136,9 @@
     - "{{ XQUEUE_MYSQL_DB_NAME|default('None') }}"
     - "{{ ORA_MYSQL_DB_NAME|default('None') }}"
     - "{{ EDX_NOTES_API_MYSQL_DB_NAME|default('None') }}"
-
-- name: setup the migration db user for analytics
-  mysql_user: >
-    name={{ COMMON_MYSQL_MIGRATE_USER }}
-    password={{ COMMON_MYSQL_MIGRATE_PASS }}
-    priv='{{ item }}.*:ALL'
-    append_privs=yes
-  when: ANALYTICS_API_CONFIG is defined
-  with_items:
-    - "{{ ANALYTICS_API_CONFIG['DATABASES']['default']['NAME'] }}"
-    - "{{ ANALYTICS_API_CONFIG['DATABASES']['reports']['NAME'] }}"
-
+    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['default']['NAME']|default('None') }}"
+    - "{{ ANALYTICS_API_SERVICE_CONFIG['DATABASES']['reports']['NAME']|default('None') }}"
+    - "{{ INSIGHTS_DATABASES.default.NAME|default('None') }}"
 
 - name: setup the read-only db user
   mysql_user: >