diff --git a/ahoy.yml b/ahoy.yml
index 8220e9b7b20048ed4db61c5205fec668128c32c7..6cf4e049de0b1ea13a14d3d2a60479462983974b 100644
--- a/ahoy.yml
+++ b/ahoy.yml
@@ -1,13 +1,13 @@
 ahoyapi: v2
 commands:
   exec:
-    cmd: docker run -it -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/drupal -v $SSH_AUTH_SOCK:/ssh-agent -v ${HOME}/.traefik:/root/.traefik -e SSH_AUTH_SOCK=/ssh-agent -w /drupal registry.lakedrops.com/docker/l3d "$@"
+    cmd: export $(cat .env | xargs) && docker run -it -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/drupal -v $SSH_AUTH_SOCK:/ssh-agent -v ${HOME}/.traefik:/root/.traefik -e SSH_AUTH_SOCK=/ssh-agent -w /drupal registry.lakedrops.com/docker/l3d:php-${PHP_VERSION} "$@"
     hide: true
   up:
     cmd: ahoy dev exec /usr/bin/fish
     usage: Start container with all development tools
   update:
-    cmd: docker pull registry.lakedrops.com/docker/l3d
+    cmd: export $(cat .env | xargs) && docker pull registry.lakedrops.com/docker/l3d:php-${PHP_VERSION}
     usage: Update image with the latest development tools
   scaffold:
     cmd: ahoy dev exec composer lakedrops:scaffold