diff --git a/scripts/find-container.sh b/scripts/find-container.sh
index ecce0f9..2582ba0 100755
--- a/scripts/find-container.sh
+++ b/scripts/find-container.sh
@@ -2,9 +2,9 @@
 set -e
 
 if [[ ! -z "$NEXTCLOUD_PROJECT_NAME" ]]; then
-    containerName="${NEXTCLOUD_PROJECT_NAME}_"
+    containerName="${NEXTCLOUD_PROJECT_NAME}[_-]"
 else
-    matchEnd=","
+    matchEnd="(,|\.\d+)"
 fi
 
 containerName="${containerName}${NEXTCLOUD_CONTAINER_NAME}"