diff --git a/component/microgateway-setup.yml b/component/microgateway-setup.yml
index 76e5328..79748dc 100644
--- a/component/microgateway-setup.yml
+++ b/component/microgateway-setup.yml
@@ -2,10 +2,6 @@
 - hosts: micro
   vars:
     config_output: '/tmp/edgemicro_config_output.txt'
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
   tasks:
 
   - name: Init edgemicro
diff --git a/configuration/opdk-setup-os.yml b/configuration/opdk-setup-os.yml
index 3d176e9..c6cc125 100644
--- a/configuration/opdk-setup-os.yml
+++ b/configuration/opdk-setup-os.yml
@@ -4,6 +4,7 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
+  - { role: apigee-opdk-setup-default-settings, tags: ['cache'] }
   - { role: apigee-opdk-setup-os-minimum, tags: ['os-pre-req'] }
   - { role: apigee-opdk-setup-os-common, tags: ['os-pre-req'] }
 
diff --git a/configuration/update-cache.yml b/configuration/update-cache.yml
deleted file mode 100644
index 9bdc078..0000000
--- a/configuration/update-cache.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: planet,micro
-  vars_files:
-  - ~/.apigee/credentials.yml
-  roles:
-  - apigee-opdk-setup-default-settings
-  tags:
-  - cache
diff --git a/installation.yml b/installation.yml
index c94806f..a6a0667 100644
--- a/installation.yml
+++ b/installation.yml
@@ -1,6 +1,6 @@
 ---
-- include: configuration/update-cache.yml
+- name: Configure OS for microgateway
+  include: configuration/opdk-setup-os.yml
 
-- include: configuration/opdk-setup-os.yml
-
-- include: component/microgateway-setup.yml
+- name: Install and configure microgateway
+  include: component/microgateway-setup.yml