diff --git a/ansible/amber.yml b/ansible/amber.yml
index 9b19c7f..7181e1c 100644
--- a/ansible/amber.yml
+++ b/ansible/amber.yml
@@ -43,7 +43,7 @@
         loop_var: app_item
 
     - include_role:
-        name: nginx-web-proxy
+        name: nginx-proxy
       private: yes
       vars:
         nginx_proxy_name: '{{ fr_item.name }}'
diff --git a/ansible/roles/docker-app/meta/main.yml b/ansible/roles/docker-app/meta/main.yml
deleted file mode 100644
index cd21505..0000000
--- a/ansible/roles/docker-app/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-
diff --git a/ansible/roles/docker-app/tasks/main.yml b/ansible/roles/docker-app/tasks/main.yml
index d454b76..cb8e41f 100644
--- a/ansible/roles/docker-app/tasks/main.yml
+++ b/ansible/roles/docker-app/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create owner.
   include_role:
-    name: blocks/owner
+    name: owner
   vars:
     owner_name: '{{ username }}'
     owner_group: '{{ username }}'
diff --git a/ansible/roles/nginx-web-proxy/defaults/main.yml b/ansible/roles/nginx-proxy/defaults/main.yml
similarity index 100%
rename from ansible/roles/nginx-web-proxy/defaults/main.yml
rename to ansible/roles/nginx-proxy/defaults/main.yml
diff --git a/ansible/roles/nginx-web-proxy/tasks/main.yml b/ansible/roles/nginx-proxy/tasks/main.yml
similarity index 94%
rename from ansible/roles/nginx-web-proxy/tasks/main.yml
rename to ansible/roles/nginx-proxy/tasks/main.yml
index c28b07f..0ad8890 100644
--- a/ansible/roles/nginx-web-proxy/tasks/main.yml
+++ b/ansible/roles/nginx-proxy/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: "Configure ssl certificate for {{ nginx_proxy_name }}"
   include_role:
-    name: blocks/ssl-certificate
+    name: ssl-certificate
   vars:
     cert_type: '{{ nginx_ssl_type }}'
     cert_name: '{{ nginx_ssl_name }}'
diff --git a/ansible/roles/blocks/owner/defaults/main.yml b/ansible/roles/owner/defaults/main.yml
similarity index 100%
rename from ansible/roles/blocks/owner/defaults/main.yml
rename to ansible/roles/owner/defaults/main.yml
diff --git a/ansible/roles/blocks/owner/tasks/main.yml b/ansible/roles/owner/tasks/main.yml
similarity index 100%
rename from ansible/roles/blocks/owner/tasks/main.yml
rename to ansible/roles/owner/tasks/main.yml
diff --git a/ansible/roles/blocks/owner/templates/env.j2 b/ansible/roles/owner/templates/env.j2
similarity index 100%
rename from ansible/roles/blocks/owner/templates/env.j2
rename to ansible/roles/owner/templates/env.j2
diff --git a/ansible/roles/blocks/ssl-certificate/defaults/main.yml b/ansible/roles/ssl-certificate/defaults/main.yml
similarity index 100%
rename from ansible/roles/blocks/ssl-certificate/defaults/main.yml
rename to ansible/roles/ssl-certificate/defaults/main.yml
diff --git a/ansible/roles/blocks/ssl-certificate/tasks/letsencrypt.yml b/ansible/roles/ssl-certificate/tasks/letsencrypt.yml
similarity index 100%
rename from ansible/roles/blocks/ssl-certificate/tasks/letsencrypt.yml
rename to ansible/roles/ssl-certificate/tasks/letsencrypt.yml
diff --git a/ansible/roles/blocks/ssl-certificate/tasks/main.yml b/ansible/roles/ssl-certificate/tasks/main.yml
similarity index 100%
rename from ansible/roles/blocks/ssl-certificate/tasks/main.yml
rename to ansible/roles/ssl-certificate/tasks/main.yml
diff --git a/ansible/roles/blocks/ssl-certificate/tasks/self-signed.yml b/ansible/roles/ssl-certificate/tasks/self-signed.yml
similarity index 100%
rename from ansible/roles/blocks/ssl-certificate/tasks/self-signed.yml
rename to ansible/roles/ssl-certificate/tasks/self-signed.yml
diff --git a/ansible/roles/blocks/ssl-certificate/templates/vhost.conf.j2 b/ansible/roles/ssl-certificate/templates/vhost.conf.j2
similarity index 100%
rename from ansible/roles/blocks/ssl-certificate/templates/vhost.conf.j2
rename to ansible/roles/ssl-certificate/templates/vhost.conf.j2