diff --git a/bash/dump.sh b/bash/dump.sh
index 162523a..8484b49 100755
--- a/bash/dump.sh
+++ b/bash/dump.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
-cd $HOME/structure
-dbId=$(docker ps -q --filter name=db)
-docker exec $dbId mysqldump -u root -p123456 $1 | pv > $2
+CONTAINER=$(docker ps | grep db | awk '{print $1}')
+
+if [[ -z "${CONTAINER}" ]]; then
+  echo "Unable to find container: db"
+  exit 1
+fi
+
+docker exec -ti ${CONTAINER} mysqldump -u root -p123456 $1 | pv > $2
diff --git a/bash/enter-to-workspace.sh b/bash/enter-to-workspace.sh
index 9feb8e1..e809f91 100755
--- a/bash/enter-to-workspace.sh
+++ b/bash/enter-to-workspace.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
-DIR="$(realpath $(dirname "$(readlink -f "$0")")/..)"
-
 PHP_VERSION=$1 # Without dot
 
 if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=74; fi
 
-# Grab full name of php-fpm container
-WORKSPACE_CONTAINER=$(docker ps | grep workspace${PHP_VERSION} | awk '{print $1}')
+CONTAINER=$(docker ps | grep workspace${PHP_VERSION} | awk '{print $1}')
 
-if [[ -z "${WORKSPACE_CONTAINER}" ]]; then
-  echo "Unable to find workspace container: workspace${PHP_VERSION}"
+if [[ -z "${CONTAINER}" ]]; then
+  echo "Unable to find container: workspace${PHP_VERSION}"
   exit 1
 fi
 
-docker exec -ti ${WORKSPACE_CONTAINER} su laradock
+docker exec -ti ${CONTAINER} su laradock
diff --git a/bash/mysql.sh b/bash/mysql.sh
index aeed2ed..ed329a5 100755
--- a/bash/mysql.sh
+++ b/bash/mysql.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
-cd $HOME/structure
-docker-compose exec db bash -c 'LANG=ru_RU.UTF-8 mysql -u root -p123456'
+CONTAINER=$(docker ps | grep db | awk '{print $1}')
+
+if [[ -z "${CONTAINER}" ]]; then
+  echo "Unable to find container: db"
+  exit 1
+fi
+
+docker exec -ti ${CONTAINER} bash -c 'LANG=ru_RU.UTF-8 mysql -u root -p123456'
diff --git a/bash/restart-nginx.sh b/bash/restart-nginx.sh
index 042d9a5..d390941 100755
--- a/bash/restart-nginx.sh
+++ b/bash/restart-nginx.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
-cd $HOME/structure
-docker-compose exec web nginx -s reload
+CONTAINER=$(docker ps | grep nginx | awk '{print $1}')
+
+if [[ -z "${CONTAINER}" ]]; then
+  echo "Unable to find container: nginx"
+  exit 1
+fi
+
+docker exec -ti ${CONTAINER} nginx -s reload
\ No newline at end of file