diff --git a/testing/docker/tester-device/bin/entrypoint b/testing/docker/tester-device/bin/entrypoint
index e82309b54ecb..e397b075c815 100755
--- a/testing/docker/tester-device/bin/entrypoint
+++ b/testing/docker/tester-device/bin/entrypoint
@@ -23,4 +23,14 @@ echo "Retrieved device.  Session: $SESSION_ID"
 
 curl -o /home/worker/data/device.json -s -H "Accept: application/json" http://$CLOUD_HOST/device/properties
 
-eval $@
+buildbot_step 'Gaia clone' tc-vcs checkout /home/worker/gaia/source $GAIA_BASE_REPOSITORY $GAIA_HEAD_REPOSITORY $GAIA_REV $GAIA_REF
+
+cd gaia/source/tests/python/gaia-ui-tests/
+python setup.py develop
+pip install py
+cd /home/worker/
+
+buildbot_step 'Running tests' eval $@
+
+echo "Releasing device."
+curl --request POST http://$CLOUD_HOST/device/release
diff --git a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
index 24b97bf57e3b..ee14a2199260 100644
--- a/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
+++ b/testing/taskcluster/tasks/tests/flame_kk_gaia_ui_test_sanity.yml
@@ -15,13 +15,7 @@ task:
       testdroidProxy: true
     maxRunTime: 7200
     command:
-      - >
-        tc-vcs checkout /home/worker/gaia/source $GAIA_BASE_REPOSITORY $GAIA_HEAD_REPOSITORY $GAIA_REV $GAIA_REF &&
-        cd gaia/source/tests/python/gaia-ui-tests/ &&
-        python setup.py develop &&
-        pip install py &&
-        cd /home/worker/ &&
-        gaiatest --testvars=/home/worker/data/gaia_testvars.json --testvars=/home/worker/data/device.json --adb-host=$PROXY_HOST --adb-port=$ADB_PORT --address=$PROXY_HOST:$MARIONETTE_PORT --device $SERIAL_ID --xml-output=/home/worker/upload/logs/xml_output.xml --timeout=10000 --log-html=/home/worker/upload/logs/index.html --restart --type=b2g+sanity-dsds --log-mach=-  --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
+      - gaiatest --testvars=/home/worker/data/gaia_testvars.json --testvars=/home/worker/data/device.json --adb-host=$PROXY_HOST --adb-port=$ADB_PORT --address=$PROXY_HOST:$MARIONETTE_PORT --device $SERIAL_ID --xml-output=/home/worker/upload/logs/xml_output.xml --timeout=10000 --log-html=/home/worker/upload/logs/index.html --restart --type=b2g+sanity-dsds --log-mach=-  --log-raw=/home/worker/upload/logs/raw.log gaia/source/tests/python/gaia-ui-tests/gaiatest/tests/functional/manifest.ini
     artifacts:
       'private/device.json':
         type: file