diff --git a/backup.yml b/backup.yml
index abcd706..d65bd9e 100644
--- a/backup.yml
+++ b/backup.yml
@@ -8,77 +8,77 @@
 - include: components/opdk-backup.yml
   vars:
     hosts: 'ds'
-    profile: 'apigee-zookeeper'
+    component_name: 'apigee-zookeeper'
   tags:
   - zookeeper
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'ds'
-    profile: 'apigee-cassandra'
+    component_name: 'apigee-cassandra'
   tags:
   - cassandra
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'rmp'
-    profile: 'edge-router'
+    component_name: 'edge-router'
   tags:
   - router
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'rmp'
-    profile: 'edge-message-processor'
+    component_name: 'edge-message-processor'
   tags:
   - mp
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'pg'
-    profile: 'edge-postgres-server'
+    component_name: 'edge-postgres-server'
   tags:
   - ps
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'pgmaster[0]'
-    profile: 'apigee-postgresql'
+    component_name: 'apigee-postgresql'
   tags:
   - pg
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'qpid'
-    profile: 'edge-qpid-server'
+    component_name: 'edge-qpid-server'
   tags:
   - qs
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'qpid'
-    profile: 'apigee-qpidd'
+    component_name: 'apigee-qpidd'
   tags:
   - qpid
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'ldap'
-    profile: 'apigee-openldap'
+    component_name: 'apigee-openldap'
   tags:
   - ldap
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'ms'
-    profile: 'edge-management-server'
+    component_name: 'edge-management-server'
   tags:
   - ms
 
 - include: components/opdk-backup.yml
   vars:
     hosts: 'ui'
-    profile: 'edge-ui'
+    component_name: 'edge-ui'
   tags:
   - ui
 
diff --git a/components/opdk-backup.yml b/components/opdk-backup.yml
index fd4fd07..5f811fc 100644
--- a/components/opdk-backup.yml
+++ b/components/opdk-backup.yml
@@ -1,8 +1,7 @@
 ---
 - hosts: '{{ hosts }}'
-  serial: 1
+  gather_facts: yes
+  vars_files:
+  - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-default-settings
   - { role: apigee-opdk-backup, component_profile: '{{ profile }}' }
-
-