diff --git a/.woodpecker.yml b/.woodpecker.yml
index f2c5750..cea680b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -25,10 +25,12 @@ steps:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - echo "Logging into registries"
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Logging into registries"'
       - echo "$${DOCKER_REGISTRY_PASSWORD}" | docker login -u "$${DOCKER_REGISTRY_USER}" --password-stdin
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
-      - echo "Building and pushing application for staging"
+      - 'echo "Building and pushing application for staging"'
       - docker compose -f docker-compose.staging.yml build --no-cache
       - docker compose -f docker-compose.staging.yml push
     when:
@@ -47,7 +49,9 @@ steps:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - echo "Deploying to staging environment"
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Deploying to staging environment"'
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
       - docker stack deploy --with-registry-auth -c ./stack.staging.yml $${CI_REPO_NAME}-staging
     when:
@@ -59,7 +63,9 @@ steps:
     name: wait-for-deploy-staging
     image: woodpeckerci/plugin-git
     commands:
-      - echo "Waiting for staging deploy step to complete rollout."
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Waiting for staging deploy step to complete rollout."'
       - sleep 20
     when:
       branch: main
@@ -77,8 +83,10 @@ steps:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - echo "Cleaning up staging environment"
-      - for i in {1..5}; do docker stack rm ${CI_REPO_NAME}-staging && break || sleep 10; done
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Cleaning up staging environment"'
+      - for i in {1..5}; do docker stack rm $${CI_REPO_NAME}-staging && break || sleep 10; done
       - docker compose -f docker-compose.staging.yml down
       - docker compose -f docker-compose.staging.yml rm -f
     when:
@@ -101,10 +109,12 @@ steps:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - echo "Logging into registries"
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Logging into registries"'
       - echo "$${DOCKER_REGISTRY_PASSWORD}" | docker login -u "$${DOCKER_REGISTRY_USER}" --password-stdin
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
-      - echo "Building and pushing application for production"
+      - 'echo "Building and pushing application for production"'
       - docker compose -f docker-compose.production.yml build --no-cache
       - docker compose -f docker-compose.production.yml push
     when:
@@ -123,9 +133,11 @@ steps:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - echo "Deploying to production environment"
+      - HOSTNAME=$(docker info --format '{{.Name}}')
+      - 'echo "Worker hostname: $HOSTNAME"'
+      - 'echo "Deploying to production environment"'
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
       - docker stack deploy --with-registry-auth -c ./stack.production.yml $${CI_REPO_NAME}
     when:
       branch: main
-      event: [push, cron]
+      event: [push, cron]
\ No newline at end of file