diff --git a/ahoy.drush.yml b/ahoy.drush.yml
index 3d6f7e5fb8c8764b23cf5ae978e91746334abc66..9cf9ce8a0bf3345425e5d2253a8e07e4578421fd 100644
--- a/ahoy.drush.yml
+++ b/ahoy.drush.yml
@@ -1,24 +1,24 @@
 ahoyapi: v2
 commands:
   exec:
-    cmd: docker-compose exec --user root php drush "$@"
+    cmd: ahoy d4d exec drush "$@"
     usage: Run Drush in PHP container
   pull:
     cmd: |
-      docker-compose exec --user root php drush sql:sync --create-db @default.live @default.dev
-      docker-compose exec --user root php drush @default.dev cr
-      docker-compose exec --user root php drush @default.dev dev on
-      docker-compose exec --user root php drush @default.dev cim --partial --source=/var/www/html/config/default/environments/develop
-      docker-compose exec --user root php drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
+      ahoy drush exec sql:sync --create-db @default.live @default.dev
+      ahoy drush exec @default.dev cr
+      ahoy drush exec @default.dev dev on
+      ahoy drush exec @default.dev cim --partial --source=/var/www/html/config/default/environments/develop
+      ahoy drush exec rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
     usage: Pull files and DB from live site
   pull-sql:
     cmd: |
-      docker-compose exec --user root php drush sql:sync --create-db @default.live @default.dev
-      docker-compose exec --user root php drush @default.dev cr
-      docker-compose exec --user root php drush @default.dev dev on
-      docker-compose exec --user root php drush @default.dev cim --partial --source=/var/www/html/config/default/environments/develop
+      ahoy drush exec sql:sync --create-db @default.live @default.dev
+      ahoy drush exec @default.dev cr
+      ahoy drush exec @default.dev dev on
+      ahoy drush exec @default.dev cim --partial --source=/var/www/html/config/default/environments/develop
     usage: Pull DB from live site
   pull-files:
     cmd: |
-      docker-compose exec --user root php drush rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
+      ahoy drush exec rsync @default.live:%files/ @default.dev:%files -- --chown=www-data:www-data --safe-links --max-size=20M
     usage: Pull files from live site
diff --git a/ahoy.yml b/ahoy.yml
index f0e6b25f5bbae4153db445d16591f483fa7ab6e0..d06dd935c83fadbc38f2aabedadaea11b162de2d 100644
--- a/ahoy.yml
+++ b/ahoy.yml
@@ -1,5 +1,8 @@
 ahoyapi: v2
 commands:
+  exec:
+    cmd: docker-compose exec --user root php "$@"
+    hide: true
   c:
     cmd: docker-compose "$@"
     usage: Run docker-compose
@@ -23,11 +26,11 @@ commands:
     usage: Run docker-compose start
   fs:
     cmd: |
-      docker-compose exec --user root php chown -R www-data:www-data .
-      docker-compose exec --user root php chmod -R g+w .
+      ahoy d4d exec chown -R www-data:www-data .
+      ahoy d4d exec chmod -R g+w .
     usage: Open shell in the PHP container
   shell:
-    cmd: docker-compose exec --user root php /bin/bash "$@"
+    cmd: ahoy d4d exec /bin/bash "$@"
     usage: Open shell in the PHP container
   update:
     cmd: composer lakedrops:docker4drupal