diff --git a/.gitignore b/.gitignore
index 96c3897..e47a1db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ _data
 .idea
 *.iml
 .DS_Store
-*.log
\ No newline at end of file
+*.log
+peek.sql
\ No newline at end of file
diff --git a/scripts/get_logs.sh b/scripts/get_logs.sh
index 4661526..faab404 100755
--- a/scripts/get_logs.sh
+++ b/scripts/get_logs.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
-docker exec -t openfire-docker-compose-xmpp1-1 cat /usr/local/openfire/logs/openfire.log > 1-openfire.log
-docker exec -t openfire-docker-compose-xmpp2-1 cat /usr/local/openfire/logs/openfire.log > 2-openfire.log
-docker exec -t openfire-docker-compose-xmpp3-1 cat /usr/local/openfire/logs/openfire.log > 3-openfire.log
-docker exec -t openfire-docker-compose_otherxmpp_1 cat /usr/local/openfire/logs/openfire.log > other-openfire.log
+CONTAINER_ONE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp1.1)
+CONTAINER_TWO=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp2.1)
+CONTAINER_THREE=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+xmpp3.1)
+CONTAINER_OTHER=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+otherxmpp.1)
+
+[ -n "$CONTAINER_ONE" ] && docker exec -t "$CONTAINER_ONE" cat /usr/local/openfire/logs/openfire.log > 1-openfire.log
+[ -n "$CONTAINER_TWO" ] && docker exec -t "$CONTAINER_TWO" cat /usr/local/openfire/logs/openfire.log > 2-openfire.log
+[ -n "$CONTAINER_THREE" ] && docker exec -t "$CONTAINER_THREE" cat /usr/local/openfire/logs/openfire.log > 3-openfire.log
+[ -n "$CONTAINER_OTHER" ] && docker exec -t "$CONTAINER_OTHER" cat /usr/local/openfire/logs/openfire.log > other-openfire.log
diff --git a/scripts/peek_at_database.sh b/scripts/peek_at_database.sh
index 14ed8c3..f98c466 100755
--- a/scripts/peek_at_database.sh
+++ b/scripts/peek_at_database.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 # Get a dump of the Openfire database in db_1 to peek at
-docker exec -t openfire-docker-compose_db_1 pg_dump -U openfire openfire > peek.sql
\ No newline at end of file
+CONTAINER_NAME=$(docker ps --filter status=running --format "{{.Names}}" | grep -E openfire-docker.+db.1)
+docker exec -t "$CONTAINER_NAME" pg_dump -U openfire openfire > peek.sql
\ No newline at end of file