diff --git a/playbooks/adm.yml b/playbooks/adm.yml
index 0a7d70c..0f88a83 100644
--- a/playbooks/adm.yml
+++ b/playbooks/adm.yml
@@ -24,7 +24,7 @@
     - base
     - ansible-host
     - certbot
-    - role: kerberos/keytab
+    - role: keytab
       principals:
         - "host/{{ inventory_hostname }}@{{ kerberos_realm }}"
     - nfs-client
diff --git a/playbooks/collab.yml b/playbooks/collab.yml
index 00f5e6f..98a515c 100644
--- a/playbooks/collab.yml
+++ b/playbooks/collab.yml
@@ -24,7 +24,7 @@
     - base
     - collab
     - mod_auth_gssapi
-    - role: kerberos/keytab
+    - role: keytab
       keytab: /etc/httpd/httpd.keytab
       principals: HTTP/collab.foo.sh@FOO.SH
       group: apache
diff --git a/playbooks/mail.yml b/playbooks/mail.yml
index eb7917b..2ce6cc1 100644
--- a/playbooks/mail.yml
+++ b/playbooks/mail.yml
@@ -22,7 +22,7 @@
 
   roles:
     - base
-    - role: kerberos/keytab
+    - role: keytab
       principals:
         - "host/{{ inventory_hostname }}@{{ kerberos_realm }}"
         - "smtp/{{ mail_server }}@{{ kerberos_realm }}"
diff --git a/playbooks/munin.yml b/playbooks/munin.yml
index 9d9629c..210f871 100644
--- a/playbooks/munin.yml
+++ b/playbooks/munin.yml
@@ -23,7 +23,7 @@
   roles:
     - base
     - mod_auth_gssapi
-    - role: kerberos/keytab
+    - role: keytab
       keytab: /etc/httpd/httpd.keytab
       principals: HTTP/munin.foo.sh@FOO.SH
       group: apache
diff --git a/playbooks/nas.yml b/playbooks/nas.yml
index 3c77143..17c6e15 100644
--- a/playbooks/nas.yml
+++ b/playbooks/nas.yml
@@ -24,7 +24,7 @@
     - kerberos
     - sssd
     - nfs-server
-    - role: kerberos/keytab
+    - role: keytab
       principals: "nfs/{{ inventory_hostname }}@FOO.SH"
 
   tasks:
diff --git a/playbooks/print.yml b/playbooks/print.yml
index cf9d258..aca0043 100644
--- a/playbooks/print.yml
+++ b/playbooks/print.yml
@@ -35,7 +35,7 @@
     - import_role:
         name: cups-server
     - import_role:
-        name: kerberos/keytab
+        name: keytab
       vars:
         keytab: /etc/cups/cups.keytab
         principals: "HTTP/print.foo.sh@{{ kerberos_realm }}"
diff --git a/playbooks/shell.yml b/playbooks/shell.yml
index 97df9f5..fe2030c 100644
--- a/playbooks/shell.yml
+++ b/playbooks/shell.yml
@@ -11,7 +11,7 @@
 
   roles:
     - base
-    - role: kerberos/keytab
+    - role: keytab
       principals:
         - "host/{{ inventory_hostname }}@{{ kerberos_realm }}"
         - "nfs/{{ inventory_hostname }}@{{ kerberos_realm }}"
diff --git a/playbooks/static.yml b/playbooks/static.yml
index 4d5b6fc..2b62646 100644
--- a/playbooks/static.yml
+++ b/playbooks/static.yml
@@ -11,7 +11,7 @@
 
   roles:
     - base
-    - role: kerberos/keytab
+    - role: keytab
       principals:
         - "host/{{ inventory_hostname }}@FOO.SH"
         - "nfs/{{ inventory_hostname }}@FOO.SH"
diff --git a/playbooks/zm.yml b/playbooks/zm.yml
index 810d34e..c4775ee 100644
--- a/playbooks/zm.yml
+++ b/playbooks/zm.yml
@@ -23,7 +23,7 @@
   roles:
     - base
     - mod_auth_gssapi
-    - role: kerberos/keytab
+    - role: keytab
       keytab: /etc/httpd/httpd.keytab
       principals: HTTP/zm.foo.sh@FOO.SH
       group: apache
diff --git a/roles/dovecot/tasks/main.yml b/roles/dovecot/tasks/main.yml
index 884639b..603eb89 100644
--- a/roles/dovecot/tasks/main.yml
+++ b/roles/dovecot/tasks/main.yml
@@ -5,9 +5,9 @@
     name: dovecot
     state: installed
 
-- name: create kerberos keytab
+- name: create kerberoskeytab
   include_role:
-    name: kerberos/keytab
+    name: keytab
   vars:
     keytab: /etc/dovecot/dovecot.keytab
     principals:
diff --git a/roles/kerberos/keytab/defaults/main.yml b/roles/keytab/defaults/main.yml
similarity index 100%
rename from roles/kerberos/keytab/defaults/main.yml
rename to roles/keytab/defaults/main.yml
diff --git a/roles/kerberos/keytab/tasks/main.yml b/roles/keytab/tasks/main.yml
similarity index 100%
rename from roles/kerberos/keytab/tasks/main.yml
rename to roles/keytab/tasks/main.yml