diff --git a/docker-compose/examples/grafana/docker-compose.yml b/docker-compose/examples/grafana/docker-compose.yml
index c2fb650..21f7718 100644
--- a/docker-compose/examples/grafana/docker-compose.yml
+++ b/docker-compose/examples/grafana/docker-compose.yml
@@ -14,9 +14,9 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/grafana-grafana-${CONTEXT}/grafana/data/db:/usr/lib/grafana
-            # - /opt/docker-data/grafana-grafana-${CONTEXT}/grafana/data/logs:/var/log/grafana
-            # - /opt/docker-data/grafana-grafana-${CONTEXT}/grafana/config:/etc/grafana
+            # - /opt/docker-data/grafana-${CONTEXT}/grafana/data/db:/usr/lib/grafana
+            # - /opt/docker-data/grafana-${CONTEXT}/grafana/data/logs:/var/log/grafana
+            # - /opt/docker-data/grafana-${CONTEXT}/grafana/config:/etc/grafana
         environment:
             # GRAFANA_USER: ${GRAFANA_USER}
             # GRAFANA_PASSWORD: ${GRAFANA_PASSWORD}
@@ -38,9 +38,9 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/grafana-nginx-${CONTEXT}/nginx/data/db:/usr/lib/nginx
-            # - /opt/docker-data/grafana-nginx-${CONTEXT}/nginx/data/logs:/var/log/nginx
-            # - /opt/docker-data/grafana-nginx-${CONTEXT}/nginx/config:/etc/nginx
+            # - /opt/docker-data/grafana-${CONTEXT}/nginx/data/db:/usr/lib/nginx
+            # - /opt/docker-data/grafana-${CONTEXT}/nginx/data/logs:/var/log/nginx
+            # - /opt/docker-data/grafana-${CONTEXT}/nginx/config:/etc/nginx
         environment:
             # NGINX_USER: ${NGINX_USER}
             # NGINX_PASSWORD: ${NGINX_PASSWORD}
diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml
index f254c24..e4ce915 100644
--- a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml	
+++ b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml	
@@ -35,9 +35,9 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-${CONTEXT}/{{ component }}/data/db:/usr/lib/{{ component }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-${CONTEXT}/{{ component }}/data/logs:/var/log/{{ component }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-${CONTEXT}/{{ component }}/config:/etc/{{ component }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/{{ component }}/data/db:/usr/lib/{{ component }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/{{ component }}/data/logs:/var/log/{{ component }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/{{ component }}/config:/etc/{{ component }}
         environment:
             # {{ component.upper() }}_USER: ${% raw %}{{% endraw %}{{ component.upper() }}_USER{% raw %}}{% endraw %}
             # {{ component.upper() }}_PASSWORD: ${% raw %}{{% endraw %}{{ component.upper() }}_PASSWORD{% raw %}}{% endraw %}