diff --git a/roles/krb5/defaults/main.yml b/roles/ipa-krb5/defaults/main.yml
similarity index 100%
rename from roles/krb5/defaults/main.yml
rename to roles/ipa-krb5/defaults/main.yml
diff --git a/roles/krb5/meta/main.yml b/roles/ipa-krb5/meta/main.yml
similarity index 100%
rename from roles/krb5/meta/main.yml
rename to roles/ipa-krb5/meta/main.yml
diff --git a/roles/krb5/tasks/main.yml b/roles/ipa-krb5/tasks/main.yml
similarity index 100%
rename from roles/krb5/tasks/main.yml
rename to roles/ipa-krb5/tasks/main.yml
diff --git a/roles/krb5/templates/krb5.conf.j2 b/roles/ipa-krb5/templates/krb5.conf.j2
similarity index 100%
rename from roles/krb5/templates/krb5.conf.j2
rename to roles/ipa-krb5/templates/krb5.conf.j2
diff --git a/roles/krb5/vars/default.yml b/roles/ipa-krb5/vars/default.yml
similarity index 100%
rename from roles/krb5/vars/default.yml
rename to roles/ipa-krb5/vars/default.yml
diff --git a/roles/sssd/defaults/main.yml b/roles/ipa-sssd/defaults/main.yml
similarity index 100%
rename from roles/sssd/defaults/main.yml
rename to roles/ipa-sssd/defaults/main.yml
diff --git a/roles/sssd/meta/main.yml b/roles/ipa-sssd/meta/main.yml
similarity index 100%
rename from roles/sssd/meta/main.yml
rename to roles/ipa-sssd/meta/main.yml
diff --git a/roles/sssd/tasks/main.yml b/roles/ipa-sssd/tasks/main.yml
similarity index 100%
rename from roles/sssd/tasks/main.yml
rename to roles/ipa-sssd/tasks/main.yml
diff --git a/roles/sssd/templates/sssd.conf.j2 b/roles/ipa-sssd/templates/sssd.conf.j2
similarity index 100%
rename from roles/sssd/templates/sssd.conf.j2
rename to roles/ipa-sssd/templates/sssd.conf.j2
diff --git a/roles/sssd/vars/default.yml b/roles/ipa-sssd/vars/default.yml
similarity index 100%
rename from roles/sssd/vars/default.yml
rename to roles/ipa-sssd/vars/default.yml
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 1ecb36d03ad427094d8e04160c476b065f6c4062..2ad4eb63124e48c2bfa61412d7d85b347ee7f843 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -192,7 +192,7 @@
 
   - name: Install - Configure krb5 for IPA realm "{{ ipadiscovery.realm }} <= 4.4"
     include_role:
-      name: krb5
+      name: ipa-krb5
     vars:
       krb5_servers: "{{ ipadiscovery.servers if not ipadiscovery.dnsok or not ipadiscovery.kdc else [ ] }}"
       krb5_realm: "{{ ipadiscovery.realm }}"
@@ -204,7 +204,7 @@
 
   - name: Install - Configure krb5 for IPA realm "{{ ipadiscovery.realm }} > 4.4"
     include_role:
-      name: krb5
+      name: ipa-krb5
     vars:
       krb5_servers: "{{ ipadiscovery.servers if not ipadiscovery.dnsok or not ipadiscovery.kdc else [ ] }}"
       krb5_realm: "{{ ipadiscovery.realm }}"