diff --git a/entrypoint.sh b/entrypoint.sh
index 20a33b8..52cdfbb 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -41,9 +41,9 @@ name_resolver() {
                                                                                                                   
                         UPS=""                                                                                    
                         for ROLE in $(echo $ROLES); do
-				FILTERED_BY_ROLE=$(docker inspect $UP -f '{{.Config.Labels.roles}}' | uniq | grep $ROLE)
-				if [[ "$(echo $FILTERED_BY_ROLE)" != "" ]]; then                                             
-					UPS="$UPS $UP";
+                               	FILTERED_BY_ROLE=$(docker inspect $UP -f '{{.Name}} {{.Config.Labels.roles}}' | uniq | grep $ROLE| awk '{print $1}')
+                                if [[ "$(echo $FILTERED_BY_ROLE)" != "" ]]; then                                                                    
+                                        UPS="$UPS $FILTERED_BY_ROLE";     
                                 fi
                         done