diff --git a/.github/workflows/test_sitl_copter.yml b/.github/workflows/test_sitl_copter.yml
index e4328d7803..663796b6be 100644
--- a/.github/workflows/test_sitl_copter.yml
+++ b/.github/workflows/test_sitl_copter.yml
@@ -1,6 +1,6 @@
 name: test copter
 
-on: [push, pull_request, workflow_dispatch]
+on: [push, workflow_dispatch]
 # paths:
 # - "*"
 # - "!README.md" <-- don't rebuild on doc change
diff --git a/Tools/scripts/mttr-build-ci.sh b/Tools/scripts/mttr-build-ci.sh
index dddb719e3a..e9f18f84a1 100755
--- a/Tools/scripts/mttr-build-ci.sh
+++ b/Tools/scripts/mttr-build-ci.sh
@@ -26,8 +26,21 @@ echo $PATH
 ./waf configure --board=sitl --debug --enable-opendroneid
 ./waf copter
 
-mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-MttrCubeBlack.apj"
-mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-MttrCubeOrange.apj"
-mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-MttrCubeBlack.elf"
-mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-MttrCubeOrange.elf"
+# Get Ardupilot version
+eval $(sed -n 's/^#define  *\([^ ]*\)  *\(.*\) *$/export \1=\2/p' ArduCopter/version.h)
+
+# Get mttr git tag (replace all dashes with underscores)
+git fetch --tags --no-recurse-submodules
+MTTR_GIT_TAG=$(echo $(git tag -l "mttr-*" --sort=-committerdate | head -1) | tr - _)
+
+# Get mttr git hash
+MTTR_GIT_HASH=$(git rev-parse --short=7 HEAD)
+
+# Create version string
+VERSION_DESCRIPTION="ap_${FW_MAJOR}.${FW_MINOR}.${FW_PATCH}-${MTTR_GIT_TAG}-${MTTR_GIT_HASH}"
+
+mv build/MttrCubeBlack/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.apj"
+mv build/MttrCubeOrange/bin/arducopter.apj "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.apj"
+mv build/MttrCubeBlack/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeBlack.elf"
+mv build/MttrCubeOrange/bin/arducopter "/tmp/deploy_files/copter-${VERSION_DESCRIPTION}-MttrCubeOrange.elf"
 mv build/sitl/bin/arducopter "/tmp/deploy_files/sitl.elf"