diff --git a/tasks/database-setup.yml b/tasks/database-setup.yml
index 37e0819..d6bfeaf 100644
--- a/tasks/database-setup.yml
+++ b/tasks/database-setup.yml
@@ -17,12 +17,8 @@
   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.stdout | search("Table 'rally.deployments' doesn't exist")
-  tags:
-    - rally-db-setup
\ No newline at end of file
diff --git a/tasks/install.yml b/tasks/install.yml
index d427618..4ec4768 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -16,8 +16,6 @@
 - include: install-apt.yml
   when:
     - ansible_pkg_mgr == 'apt'
-  tags:
-    - install-apt
 
 - name: Create developer mode constraint file
   copy:
@@ -28,9 +26,6 @@
       {% endfor %}
   when:
     - rally_developer_mode | bool
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Clone requirements git repository
   git:
@@ -41,27 +36,18 @@
     version: "{{ rally_requirements_git_install_branch }}"
   when:
     - rally_developer_mode | bool
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Add constraints to pip_install_options fact for developer mode
   set_fact:
     pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
   when:
     - rally_developer_mode | bool
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Set pip_install_options_fact when not in developer mode
   set_fact:
     pip_install_options_fact: "{{ pip_install_options|default('') }}"
   when:
     - not rally_developer_mode | bool
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Install requires pip packages
   pip:
@@ -72,9 +58,6 @@
   until: install_packages|success
   retries: 5
   delay: 2
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Get local venv checksum
   stat:
@@ -83,9 +66,6 @@
   when:
     - not rally_developer_mode | bool
   register: local_venv_stat
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Get remote venv checksum
   uri:
@@ -94,9 +74,6 @@
   when:
     - not rally_developer_mode | bool
   register: remote_venv_checksum
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 # TODO: When project moves to ansible 2 we can pass this a sha256sum which will:
 #       a) allow us to remove force: yes
@@ -114,16 +91,10 @@
     - not rally_developer_mode | bool
     - (local_venv_stat.stat.exists == False or
         {{ local_venv_stat.stat.checksum is defined and local_venv_stat.stat.checksum != remote_venv_checksum.content | trim }})
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Set rally get_venv fact
   set_fact:
     rally_get_venv: "{{ get_venv }}"
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Remove existing venv
   file:
@@ -131,18 +102,12 @@
     state: absent
   when:
     - rally_get_venv | changed
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Create rally venv dir
   file:
     path: "{{ rally_bin | dirname }}"
     state: directory
   register: rally_venv_dir
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Unarchive pre-built venv
   unarchive:
@@ -152,9 +117,6 @@
   when:
     - not rally_developer_mode | bool
     - rally_get_venv | changed or rally_venv_dir | changed
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Install pip packages
   pip:
@@ -169,9 +131,6 @@
   delay: 2
   when:
     - rally_get_venv | failed or rally_developer_mode | bool
-  tags:
-    - rally-install
-    - rally-pip-packages
 
 - name: Update virtualenv path
   command: >
@@ -179,7 +138,4 @@
   when:
     - not rally_developer_mode | bool
     - rally_get_venv | success
-  tags:
-    - rally-install
-    - rally-pip-packages
 
diff --git a/tasks/main.yml b/tasks/main.yml
index a5d16d2..df3e51d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,11 +23,20 @@
     - always
 
 - include: pre-install.yml
+  tags:
+    - rally-install
 
 - include: install.yml
+  tags:
+    - rally-install
 
 - include: post-install.yml
+  tags:
+    - rally-install
+    - rally-config
 
 - include: database-setup.yml
   when:
-    - inventory_hostname == groups[rally_host_group][0]
\ No newline at end of file
+    - inventory_hostname == groups[rally_host_group][0]
+  tags:
+    - rally-install
diff --git a/tasks/post-install.yml b/tasks/post-install.yml
index 7c1a34c..50daedc 100644
--- a/tasks/post-install.yml
+++ b/tasks/post-install.yml
@@ -22,15 +22,11 @@
     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: |
@@ -38,5 +34,3 @@
     {{ rally_bin }}/rally deployment create --fromenv --name=existing
   when:
     - rally_deployment_list_result.stdout | search("There are no deployments")
-  tags:
-    - rally-deployment-setup
diff --git a/tasks/pre-install.yml b/tasks/pre-install.yml
index 4ede710..4b5f6b0 100644
--- a/tasks/pre-install.yml
+++ b/tasks/pre-install.yml
@@ -18,8 +18,6 @@
     name: "{{ rally_system_group_name }}"
     state: "present"
     system: "yes"
-  tags:
-    - rally-group
 
 - name: Create the Rally system user
   user:
@@ -30,8 +28,6 @@
     system: "yes"
     createhome: "yes"
     home: "{{ rally_system_user_home }}"
-  tags:
-    - rally-user
 
 - name: Create Rally directories
   file:
@@ -43,5 +39,3 @@
   with_items:
     - path: "{{ rally_etc_directory }}"
     - path: "{{ rally_system_user_home }}"
-  tags:
-    - rally-directories