diff --git a/ahoy.yml b/ahoy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6a93a8ec684226d856c6cf1fb9aab572804c6c6b
--- /dev/null
+++ b/ahoy.yml
@@ -0,0 +1,8 @@
+ahoyapi: v2
+commands:
+  up:
+    cmd: docker run -it -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/drupal -v $SSH_AUTH_SOCK:/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent -w /drupal registry.lakedrops.com/docker/gitlab-drupal-ci /usr/bin/fish
+    usage: Start container with all development tools
+  update:
+    cmd: docker pull registry.lakedrops.com/docker/gitlab-drupal-ci
+    usage: Update image with the latest development tools
diff --git a/composer.json b/composer.json
index 218e23bc184a92597ce9313550944669c1c3d7be..a4a79b2ed749395346c3d3e1c5010dc7989c4695 100644
--- a/composer.json
+++ b/composer.json
@@ -69,6 +69,12 @@
                     "callback": "LakeDrops\\Drupal8ScaffoldDeveloper\\Plugin::scaffold",
                     "description": "(Re-)Configure this project for developers."
                 }
+            },
+            "ahoy": {
+                "dev": {
+                    "usage": "Development tools for Drupal",
+                    "imports": ["ahoy.yml"]
+                }
             }
         }
     },