diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5f7bdcf11c..01b845d4a3 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,15 +1,20 @@
 variables:
   image: &docker-git docker:rc-git
-  volumes:
-    - &docker.sock /var/run/docker.sock:/var/run/docker.sock
+  volumes: &docker.sock
+    - /var/run/docker.sock:/var/run/docker.sock
   environment:
     common: &common-env
       NAME: gitea.treehouse.systems/treehouse/mastodon
+  docker-step: &docker-step
+    image: docker:rc-git
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      NAME: gitea.treehouse.systems/treehouse/mastodon
 pipeline:
   build:
     image: *docker-git
-    volumes:
-      - *docker.sock
+    volumes: *docker.sock
     environment:
       <<: *common-env
     commands:
@@ -19,8 +24,7 @@ pipeline:
 
   tag-nightly:
     image: *docker-git
-    volumes:
-      - *docker.sock
+    volumes: *docker.sock
     environment:
       <<: *common-env
     commands:
@@ -38,8 +42,7 @@ pipeline:
 
   push:
     image: *docker-git
-    volumes:
-      - *docker.sock
+    volumes: *docker.sock
     environment:
       <<: *common-env
     commands: