diff --git a/docker-compose/README.md b/docker-compose/README.md
index 74e4654..31496fc 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -71,4 +71,4 @@ With an alternative single-component `hashicorpvault` service the result may loo
     └── env
         └── fully.qualified.domain.name.example
 ```
-Check out file contents over in the [examples/hashicorpvault subdir](examples/hashicorpvault).
+Check out file contents over in the [examples/hashicorpvault](examples/hashicorpvault) subdir.
diff --git a/docker-compose/examples/grafana/docker-compose.yml b/docker-compose/examples/grafana/docker-compose.yml
index b1e961b..76f8185 100644
--- a/docker-compose/examples/grafana/docker-compose.yml
+++ b/docker-compose/examples/grafana/docker-compose.yml
@@ -3,7 +3,7 @@ services:
         image: "grafana:${GRAFANA_VERSION}"
         container_name: "grafana-grafana-${CONTEXT}"
         networks:
-            grafana-cncf:
+            grafana-${CONTEXT}:
         profiles: ["full", "grafana"]
         extends:
             file: common-settings.yml
@@ -11,9 +11,9 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/grafana-grafana-cncf/grafana/data/db:/usr/lib/grafana
-            # - /opt/docker-data/grafana-grafana-cncf/grafana/data/logs:/var/log/grafana
-            # - /opt/docker-data/grafana-grafana-cncf/grafana/config:/etc/grafana
+            # - /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
         environment:
             # GRAFANA_USER: ${GRAFANA_USER}
             # GRAFANA_PASSWORD: ${GRAFANA_PASSWORD}
@@ -21,7 +21,7 @@ services:
         image: "nginx:${NGINX_VERSION}"
         container_name: "grafana-nginx-${CONTEXT}"
         networks:
-            grafana-cncf:
+            grafana-${CONTEXT}:
         profiles: ["full", "nginx"]
         extends:
             file: common-settings.yml
@@ -29,15 +29,15 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/grafana-nginx-cncf/nginx/data/db:/usr/lib/nginx
-            # - /opt/docker-data/grafana-nginx-cncf/nginx/data/logs:/var/log/nginx
-            # - /opt/docker-data/grafana-nginx-cncf/nginx/config:/etc/nginx
+            # - /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
         environment:
             # NGINX_USER: ${NGINX_USER}
             # NGINX_PASSWORD: ${NGINX_PASSWORD}
 networks:
-    grafana-cncf:
-        name: grafana-cncf
+    grafana-${CONTEXT}:
+        name: grafana-${CONTEXT}
         driver: bridge
         driver_opts:
             com.docker.network.enable_ipv6: "false"
diff --git a/docker-compose/examples/hashicorpvault/docker-compose.yml b/docker-compose/examples/hashicorpvault/docker-compose.yml
index 0e05140..a65322e 100644
--- a/docker-compose/examples/hashicorpvault/docker-compose.yml
+++ b/docker-compose/examples/hashicorpvault/docker-compose.yml
@@ -3,22 +3,22 @@ services:
         image: "hashicorpvault:${HASHICORPVAULT_VERSION}"
         container_name: "hashicorpvault-${CONTEXT}"
         networks:
-            hashicorpvault-fsf:
+            hashicorpvault-${CONTEXT}:
         extends:
             file: common-settings.yml
             service: common-settings
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/hashicorpvault-fsf/data/db:/usr/lib/hashicorpvault
-            # - /opt/docker-data/hashicorpvault-fsf/data/logs:/var/log/hashicorpvault
-            # - /opt/docker-data/hashicorpvault-fsf/config:/etc/hashicorpvault
+            # - /opt/docker-data/hashicorpvault-${CONTEXT}/data/db:/usr/lib/hashicorpvault
+            # - /opt/docker-data/hashicorpvault-${CONTEXT}/data/logs:/var/log/hashicorpvault
+            # - /opt/docker-data/hashicorpvault-${CONTEXT}/config:/etc/hashicorpvault
         environment:
             # HASHICORPVAULT_USER: ${HASHICORPVAULT_USER}
             # HASHICORPVAULT_PASSWORD: ${HASHICORPVAULT_PASSWORD}
 networks:
-    hashicorpvault-fsf:
-        name: hashicorpvault-fsf
+    hashicorpvault-${CONTEXT}:
+        name: hashicorpvault-${CONTEXT}
         driver: bridge
         driver_opts:
             com.docker.network.enable_ipv6: "false"
diff --git a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml
index 9923748..07266cd 100644
--- a/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml	
+++ b/docker-compose/{{ cookiecutter.__project_slug }}/docker-compose.yml	
@@ -6,7 +6,7 @@ services:
         image: "{{ component }}:${% raw %}{{% endraw %}{{ component.upper() }}_VERSION{% raw %}}{% endraw %}"
         container_name: "{{ cookiecutter.__service_slug }}-{{ component }}-${CONTEXT}"
         networks:
-            {{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}:
+            {{ cookiecutter.__service_slug }}-${CONTEXT}:
         profiles: ["full", "{{ component }}"]
         extends:
             file: common-settings.yml
@@ -14,9 +14,9 @@ services:
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-{{ cookiecutter.__context_slug }}/{{ component }}/data/db:/usr/lib/{{ component }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-{{ cookiecutter.__context_slug }}/{{ component }}/data/logs:/var/log/{{ component }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ component }}-{{ cookiecutter.__context_slug }}/{{ component }}/config:/etc/{{ component }}
+            # - /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 }}
         environment:
             # {{ component.upper() }}_USER: ${% raw %}{{% endraw %}{{ component.upper() }}_USER{% raw %}}{% endraw %}
             # {{ component.upper() }}_PASSWORD: ${% raw %}{{% endraw %}{{ component.upper() }}_PASSWORD{% raw %}}{% endraw %}
@@ -26,23 +26,23 @@ services:
         image: "{{ cookiecutter.__component_list_slug }}:${% raw %}{{% endraw %}{{ cookiecutter.__component_list_slug.upper() }}_VERSION{% raw %}}{% endraw %}"
         container_name: "{{ cookiecutter.__service_slug }}-${CONTEXT}"
         networks:
-            {{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}:
+            {{ cookiecutter.__service_slug }}-${CONTEXT}:
         extends:
             file: common-settings.yml
             service: common-settings
         ports:
             # - "8080:80"
         volumes:
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}/data/db:/usr/lib/{{ cookiecutter.__service_slug }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}/data/logs:/var/log/{{ cookiecutter.__service_slug }}
-            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}/config:/etc/{{ cookiecutter.__service_slug }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/data/db:/usr/lib/{{ cookiecutter.__service_slug }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/data/logs:/var/log/{{ cookiecutter.__service_slug }}
+            # - /opt/docker-data/{{ cookiecutter.__service_slug }}-${CONTEXT}/config:/etc/{{ cookiecutter.__service_slug }}
         environment:
             # {{ cookiecutter.__component_list_slug.upper() }}_USER: ${% raw %}{{% endraw %}{{ cookiecutter.__component_list_slug.upper() }}_USER{% raw %}}{% endraw %}
             # {{ cookiecutter.__component_list_slug.upper() }}_PASSWORD: ${% raw %}{{% endraw %}{{ cookiecutter.__component_list_slug.upper() }}_PASSWORD{% raw %}}{% endraw %}
 {%- endif %}
 networks:
-    {{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}:
-        name: {{ cookiecutter.__service_slug }}-{{ cookiecutter.__context_slug }}
+    {{ cookiecutter.__service_slug }}-${CONTEXT}:
+        name: {{ cookiecutter.__service_slug }}-${CONTEXT}
         driver: bridge
         driver_opts:
             com.docker.network.enable_ipv6: "false"