diff --git a/tick/grafana/defaults/main.yml b/grafana/defaults/main.yml
similarity index 100%
rename from tick/grafana/defaults/main.yml
rename to grafana/defaults/main.yml
diff --git a/tick/grafana/tasks/main.yml b/grafana/tasks/main.yml
similarity index 79%
rename from tick/grafana/tasks/main.yml
rename to grafana/tasks/main.yml
index 2eb4a066..cff66357 100644
--- a/tick/grafana/tasks/main.yml
+++ b/grafana/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
 - name: Install the grafana repo key
   apt_key: url={{ grafana_repo_key }} state=present
-  tags: [ 'grafana', 'tick' ]
+  tags: [ 'grafana' ]
 
 - name: Install the grafana deb repository
   apt_repository: repo='{{ grafana_repo }}' state=present update_cache=yes
-  tags: [ 'grafana', 'tick' ]
+  tags: [ 'grafana' ]
 
 - name: Install the grafana deb packages
   apt: name='{{ item }}' state=present
   with_items: '{{ grafana_packages }}'
-  tags: [ 'grafana', 'tick' ]
+  tags: [ 'grafana' ]
   
 - name: Ensure that grafana is enabled and running
   service: name=grafana-server state=started enabled=yes
   when: grafana_enabled
-  tags: [ 'grafana', 'tick' ]
+  tags: [ 'grafana' ]