diff --git a/configuration/opdk-setup-os.yml b/configuration/opdk-setup-os.yml
index 5f04d82..3d176e9 100644
--- a/configuration/opdk-setup-os.yml
+++ b/configuration/opdk-setup-os.yml
@@ -4,8 +4,8 @@
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
-  - apigee-opdk-setup-os-minimum
-  - apigee-opdk-setup-os-common
+  - { role: apigee-opdk-setup-os-minimum, tags: ['os-pre-req'] }
+  - { role: apigee-opdk-setup-os-common, tags: ['os-pre-req'] }
 
   tasks:
   - name: Install needed Python used for downloading files with https
@@ -55,4 +55,4 @@
     with_items:
     - { name: edgemicro, version: '2.1.1' }
     tags:
-    - os-pre-req
+    - apigee-pre-req
diff --git a/configuration/update-cache.yml b/configuration/update-cache.yml
index 56c4d88..9bdc078 100644
--- a/configuration/update-cache.yml
+++ b/configuration/update-cache.yml
@@ -6,5 +6,3 @@
   - apigee-opdk-setup-default-settings
   tags:
   - cache
-  - os-pre-req
-  - apigee-pre-req