diff --git a/.drone.yml b/.drone.yml
index 4a66afa81..a073c08f2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,9 +23,9 @@ steps:
       - export DOCKER_REPO=none
       - export LANG=en_US.UTF-8
       - export SSTATE_CACHE_DIR=/scratch/sstate-cache
-      - echo "build number $DRONE_BUILD_NUMBER"
+      - echo "Started build# $DRONE_BUILD_NUMBER"
       - echo "sstate cache dir = $SSTATE_CACHE_DIR"
-      - echo "building $${DRONE_GIT_HTTP_URL}, branch $${DRONE_REPO_BRANCH}"
+      - echo "building $DRONE_GIT_HTTP_URL, branch $DRONE_SOURCE_BRANCH"
       - git submodule update --recursive --init
       - echo export DOCKER_REPO=none > local.sh
       - echo export LANG=en_US.UTF-8 >> local.sh
@@ -40,18 +40,31 @@ steps:
       - /bin/bash -c ". ./qemux86-64-envsetup.sh && ./sources/openembedded-core/scripts/sstate-cache-management.sh -d -y"
 ---
 kind: pipeline
-name: clean workspace
+type: exec
+name: cleanup
+
+platform:
+  os: linux
+  arch: arm64
 
 clone:
   disable: true
 
-steps:
-- name: cleanup
-  trigger:
-    status:
+trigger:
+  branch:
+    - master
+    - feature-drone-exec-runner
+  event:
+    - push
+    - pull_request
+  status:
     - success
     - failure
+
+steps:
+- name: clean
   commands:
+    - echo "Deleting tmpdir for build# $DRONE_BUILD_NUMBER"
     - rm -rf /scratch/tmp-$DRONE_BUILD_NUMBER
 
 depends_on: