diff --git a/client/src/docker/lib/lib_docker.bash b/client/src/docker/lib/lib_docker.bash
index 27d91c9..0212788 100644
--- a/client/src/docker/lib/lib_docker.bash
+++ b/client/src/docker/lib/lib_docker.bash
@@ -100,8 +100,8 @@ function lib_docker::docker()
 
   # Set instance name
   declare -gxr global_image="docker-finance/${global_platform}/${global_user}"
-  declare -gxr global_container="docker-finance_${global_platform}_${global_user}"
-  declare -gxr global_network="docker-finance_${global_platform}"
+  declare -gxr global_container="docker-finance_${global_platform}_${global_user}_${global_tag}"
+  declare -gxr global_network="docker-finance"
   lib_utils::print_debug "global_image=${global_image}"
   lib_utils::print_debug "global_container=${global_container}"
   lib_utils::print_debug "global_network=${global_network}"