diff --git a/amps/ags/ci/scripts/getLogs.sh b/amps/ags/ci/scripts/getLogs.sh
index 6f780d17fc..e3785be364 100644
--- a/amps/ags/ci/scripts/getLogs.sh
+++ b/amps/ags/ci/scripts/getLogs.sh
@@ -4,9 +4,9 @@ set -x
 # Display running containers
 docker ps
 
-alfrescoContainerId=$(docker ps -a | grep '-alfresco-' | awk '{print $1}')
-shareContainerId=$(docker ps -a | grep '-share-' | awk '{print $1}')
-solrContainerId=$(docker ps -a | grep '-search-' | awk '{print $1}')
+alfrescoContainerId=$(docker ps -a | grep '\-alfresco\-' | awk '{print $1}')
+shareContainerId=$(docker ps -a | grep '\-share\-' | awk '{print $1}')
+solrContainerId=$(docker ps -a | grep '\-search\-' | awk '{print $1}')
 
 docker logs $alfrescoContainerId > alfresco.log
 if [ -n "$shareContainerId" ]; then
diff --git a/packaging/tests/scripts/wait-for-alfresco-start.sh b/packaging/tests/scripts/wait-for-alfresco-start.sh
index 23ebe23dae..98f33a8579 100755
--- a/packaging/tests/scripts/wait-for-alfresco-start.sh
+++ b/packaging/tests/scripts/wait-for-alfresco-start.sh
@@ -51,7 +51,7 @@ else
    echo "Alfresco Could not start in time."
    echo "All started containers:"	
    docker ps -a	
-   ALFCONTAINER=`docker ps -a | grep -alfresco | awk '{ print $1 }'`
+   ALFCONTAINER=`docker ps -a | grep '\-alfresco' | awk '{ print $1 }'`
    echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:"
    docker logs --tail=200 $ALFCONTAINER
    exit 1