diff --git a/commands/project/exec.sh b/commands/project/exec.sh
index c41bb00..67729e9 100755
--- a/commands/project/exec.sh
+++ b/commands/project/exec.sh
@@ -13,7 +13,7 @@ function project:exec() {
 
     _checkProject
     # Determine the first service from docker-compose.yml
-    service=$(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//')
+    service=$(_yq eval '.services | keys | .[0]' docker-compose.yml)
 
     # Check if the provided service exists
     if _serviceExists "${1}"; then
diff --git a/commands/project/exec/root.sh b/commands/project/exec/root.sh
index ec9fbbe..7f4f97c 100644
--- a/commands/project/exec/root.sh
+++ b/commands/project/exec/root.sh
@@ -13,7 +13,7 @@ function project:exec() {
 
     _checkProject
     # Determine the first service from docker-compose.yml
-    service=$(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//')
+    service=$(_yq eval '.services | keys | .[0]' docker-compose.yml)
 
     # Check if the provided service exists
     if _serviceExists "${1}"; then
diff --git a/commands/project/fix-permissions.sh b/commands/project/fix-permissions.sh
index e764c26..6aed05c 100644
--- a/commands/project/fix-permissions.sh
+++ b/commands/project/fix-permissions.sh
@@ -18,7 +18,7 @@ function project:fix-permissions() {
         _logYellow "fix-permissions not allowed with sync-mode '${SYNC_MODE}'"
     fi
 
-    local container=$(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//')
+    local container=$(_yq eval '.services | keys | .[0]' docker-compose.yml)
     local permission="dde:dde"
     local path="/var/www"
     local user=$(id -u)
diff --git a/commands/project/shell.sh b/commands/project/shell.sh
index d98e5b0..94233c5 100755
--- a/commands/project/shell.sh
+++ b/commands/project/shell.sh
@@ -10,7 +10,7 @@
 function project:shell() {
     _checkProject
     _loadProjectDotdde
-    local service=$(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//')
+    local service=$(_yq eval '.services | keys | .[0]' docker-compose.yml)
 
     if [[ "${1}" != "" ]]; then
         if _serviceExists ${1}; then
diff --git a/commands/project/shell/root.sh b/commands/project/shell/root.sh
index 9b50de8..358d19f 100755
--- a/commands/project/shell/root.sh
+++ b/commands/project/shell/root.sh
@@ -8,7 +8,7 @@
 function project:shell:root() {
     _checkProject
     _loadProjectDotdde
-    local service=$(docker run --rm -v $(pwd):/workdir mikefarah/yq:3 yq r --printMode p docker-compose.yml 'services.*' | head -n1 | sed 's/.*\.//')
+    local service=$(_yq eval '.services | keys | .[]' docker-compose.yml | head -n1 | sed 's/.*\.//')
 
     if [[ "${1}" != "" ]]; then
         if _serviceExists ${1}; then