diff --git a/tasks/database-setup.yml b/tasks/database-setup.yml
index 0d355b1..a02fd7b 100644
--- a/tasks/database-setup.yml
+++ b/tasks/database-setup.yml
@@ -17,8 +17,12 @@
   command: "{{ rally_bin }}/rally deployment list"
   ignore_errors: true
   register: rally_deployment_list_result
+  tags:
+    - rally-db-setup
 
 - name: Create/upgrade Rally DB schema
   command: "{{ rally_bin }}/rally-manage db create"
   when:
-    - rally_deployment_list_result.stderr | search("Table 'rally.deployments' doesn't exist")
\ No newline at end of file
+    - rally_deployment_list_result.stderr | search("Table 'rally.deployments' doesn't exist")
+  tags:
+    - rally-db-setup
\ No newline at end of file
diff --git a/tasks/post-install.yml b/tasks/post-install.yml
index 50daedc..7c1a34c 100644
--- a/tasks/post-install.yml
+++ b/tasks/post-install.yml
@@ -22,11 +22,15 @@
     mode: "0644"
     config_overrides: "{{ rally_config_overrides }}"
     config_type: "ini"
+  tags:
+    - rally-config
 
 - name: Check for existing Rally deployment
   command: "{{ rally_bin }}/rally deployment list"
   ignore_errors: true
   register: rally_deployment_list_result
+  tags:
+    - rally-deployment-setup
 
 - name: Setup the Rally deployment
   shell: |
@@ -34,3 +38,5 @@
     {{ rally_bin }}/rally deployment create --fromenv --name=existing
   when:
     - rally_deployment_list_result.stdout | search("There are no deployments")
+  tags:
+    - rally-deployment-setup