diff --git a/fusiondirectory/defaults/main.yml b/fusiondirectory/defaults/main.yml
index 1be11733..eb11b9a3 100644
--- a/fusiondirectory/defaults/main.yml
+++ b/fusiondirectory/defaults/main.yml
@@ -2,8 +2,8 @@
 fusiondirectory_install: False
 fusiondirectory_schemas_install: True
 # We use the debian wheezy repo for Ubuntu precise and Ubuntu trusty
-fusiond_repo: 'deb http://repos.fusiondirectory.org/debian-wheezy wheezy main'
-fusiond_extra_repo: 'deb http://repos.fusiondirectory.org/debian-extra wheezy main'
+fusiond_repo: 'deb http://repos.fusiondirectory.org/fusiondirectory-current/debian-wheezy wheezy main'
+fusiond_extra_repo: 'deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie jessie main'
 fusiond_repo_key: 62B4981F
 fusiond_gpg_repo: keys.gnupg.net
 
diff --git a/fusiondirectory/tasks/manage-fd-repos.yml b/fusiondirectory/tasks/manage-fd-repos.yml
index db866703..445175f2 100644
--- a/fusiondirectory/tasks/manage-fd-repos.yml
+++ b/fusiondirectory/tasks/manage-fd-repos.yml
@@ -11,7 +11,7 @@
       apt_repository: repo={{ fusiond_extra_repo }}
 
   when: fusiondirectory_install
-  tags: fusiondirectory
+  tags: [ 'fusiondirectory', 'fusiondirectory_repo' ]
   
 - block:
 
@@ -25,5 +25,5 @@
       apt_repository: repo={{ fusiond_extra_repo }} state=absent update_cache=yes
 
   when: not fusiondirectory_install
-  tags: fusiondirectory
+  tags: [ 'fusiondirectory', 'fusiondirectory_repo' ]