diff --git a/provision.yml b/provision.yml
index 6ebe24db..3fdb9f2d 100644
--- a/provision.yml
+++ b/provision.yml
@@ -117,7 +117,7 @@
     - { role: "docker_db",       tags: ["db",    "docker-db"      ], when: is_dev }
     - { role: "docker_redis",    tags: ["redis", "docker-redis"   ] }
     - { role: "docker_sbs",      tags: ["sbs",   "docker-sbs"     ] }
-    - { role: "docker_pyff",     tags: ["meta",  "docker-meta"    ] }
+    - { role: "docker_metadata", tags: ["meta",  "docker-meta"    ] }
     - { role: "docker_plsc",     tags: ["plsc",  "docker-plsc"    ] }
 
 - name: "container_ldap"
diff --git a/roles/docker_pyff/defaults/main.yml b/roles/docker_metadata/defaults/main.yml
similarity index 100%
rename from roles/docker_pyff/defaults/main.yml
rename to roles/docker_metadata/defaults/main.yml
diff --git a/roles/docker_pyff/files/01_idps.fd b/roles/docker_metadata/files/01_idps.fd
similarity index 100%
rename from roles/docker_pyff/files/01_idps.fd
rename to roles/docker_metadata/files/01_idps.fd
diff --git a/roles/docker_pyff/files/02_backend.fd b/roles/docker_metadata/files/02_backend.fd
similarity index 100%
rename from roles/docker_pyff/files/02_backend.fd
rename to roles/docker_metadata/files/02_backend.fd
diff --git a/roles/docker_pyff/files/03_frontend.fd b/roles/docker_metadata/files/03_frontend.fd
similarity index 100%
rename from roles/docker_pyff/files/03_frontend.fd
rename to roles/docker_metadata/files/03_frontend.fd
diff --git a/roles/docker_pyff/files/surf.png b/roles/docker_metadata/files/surf.png
similarity index 100%
rename from roles/docker_pyff/files/surf.png
rename to roles/docker_metadata/files/surf.png
diff --git a/roles/docker_pyff/files/surf.svg b/roles/docker_metadata/files/surf.svg
similarity index 100%
rename from roles/docker_pyff/files/surf.svg
rename to roles/docker_metadata/files/surf.svg
diff --git a/roles/docker_pyff/files/surf_bimi.svg b/roles/docker_metadata/files/surf_bimi.svg
similarity index 100%
rename from roles/docker_pyff/files/surf_bimi.svg
rename to roles/docker_metadata/files/surf_bimi.svg
diff --git a/roles/docker_pyff/files/surfconext.crt b/roles/docker_metadata/files/surfconext.crt
similarity index 100%
rename from roles/docker_pyff/files/surfconext.crt
rename to roles/docker_metadata/files/surfconext.crt
diff --git a/roles/docker_pyff/files/transform.xslt b/roles/docker_metadata/files/transform.xslt
similarity index 100%
rename from roles/docker_pyff/files/transform.xslt
rename to roles/docker_metadata/files/transform.xslt
diff --git a/roles/docker_pyff/files/transform_proxy.xslt b/roles/docker_metadata/files/transform_proxy.xslt
similarity index 100%
rename from roles/docker_pyff/files/transform_proxy.xslt
rename to roles/docker_metadata/files/transform_proxy.xslt
diff --git a/roles/docker_pyff/handlers/main.yml b/roles/docker_metadata/handlers/main.yml
similarity index 100%
rename from roles/docker_pyff/handlers/main.yml
rename to roles/docker_metadata/handlers/main.yml
diff --git a/roles/docker_pyff/tasks/http.yml b/roles/docker_metadata/tasks/http.yml
similarity index 100%
rename from roles/docker_pyff/tasks/http.yml
rename to roles/docker_metadata/tasks/http.yml
diff --git a/roles/docker_pyff/tasks/main.yml b/roles/docker_metadata/tasks/main.yml
similarity index 100%
rename from roles/docker_pyff/tasks/main.yml
rename to roles/docker_metadata/tasks/main.yml
diff --git a/roles/docker_pyff/tasks/pyff.yml b/roles/docker_metadata/tasks/pyff.yml
similarity index 100%
rename from roles/docker_pyff/tasks/pyff.yml
rename to roles/docker_metadata/tasks/pyff.yml
diff --git a/roles/docker_pyff/templates/index.html.j2 b/roles/docker_metadata/templates/index.html.j2
similarity index 100%
rename from roles/docker_pyff/templates/index.html.j2
rename to roles/docker_metadata/templates/index.html.j2
diff --git a/roles/docker_pyff/templates/pyff-metadata.service.j2 b/roles/docker_metadata/templates/pyff-metadata.service.j2
similarity index 100%
rename from roles/docker_pyff/templates/pyff-metadata.service.j2
rename to roles/docker_metadata/templates/pyff-metadata.service.j2
diff --git a/roles/docker_pyff/templates/pyff-metadata.timer.j2 b/roles/docker_metadata/templates/pyff-metadata.timer.j2
similarity index 100%
rename from roles/docker_pyff/templates/pyff-metadata.timer.j2
rename to roles/docker_metadata/templates/pyff-metadata.timer.j2
diff --git a/roles/docker_pyff/templates/vhosts.conf.j2 b/roles/docker_metadata/templates/vhosts.conf.j2
similarity index 100%
rename from roles/docker_pyff/templates/vhosts.conf.j2
rename to roles/docker_metadata/templates/vhosts.conf.j2