diff --git a/.buildkite/pipeline.backport.yml b/.buildkite/pipeline.backport.yml
index 98f54ca5e40..f25b2d2ead2 100644
--- a/.buildkite/pipeline.backport.yml
+++ b/.buildkite/pipeline.backport.yml
@@ -4,6 +4,8 @@ name: "integrations-backport"
 
 env:
   YQ_VERSION: 'v4.35.2'
+  # Agent images used in pipeline steps
+  LINUX_AGENT_IMAGE: "golang:${GO_VERSION}"
 
 steps:
 
@@ -49,6 +51,8 @@ steps:
   - label: "Creating the backport branch"
     key: "create-backport-branch"
     command: ".buildkite/scripts/backport_branch.sh"
+    agents:
+      image: "${LINUX_AGENT_IMAGE}"
     depends_on:
       - step: "input-variables"
         allow_failure: false
diff --git a/.buildkite/scripts/backport_branch.sh b/.buildkite/scripts/backport_branch.sh
index 46af1c283d4..789a7136cce 100755
--- a/.buildkite/scripts/backport_branch.sh
+++ b/.buildkite/scripts/backport_branch.sh
@@ -130,9 +130,21 @@ updateBackportBranchContents() {
     rm -rf "$JENKINS_FOLDER_PATH"
   fi
 
+  # Update scripts used by mage
+  local MAGEFILE_SCRIPTS_FOLDER="dev/citools"
+  local TESTSREPORTER_SCRIPTS_FOLDER="dev/testsreporter"
+  if git ls-tree -d --name-only main:${MAGEFILE_SCRIPTS_FOLDER} > /dev/null 2>&1 ; then
+    echo "Copying $MAGEFILE_SCRIPTS_FOLDER from $SOURCE_BRANCH..."
+    git checkout "$SOURCE_BRANCH" -- "${MAGEFILE_SCRIPTS_FOLDER}"
+    git checkout "$SOURCE_BRANCH" -- "${TESTSREPORTER_SCRIPTS_FOLDER}"
+    git checkout "$SOURCE_BRANCH" -- "magefile.go"
+    # Run go mod tidy to update just the dependencies related to magefile and dev scripts
+    go mod tidy
+  fi
+
   if [ "${REMOVE_OTHER_PACKAGES}" == "true" ]; then
     echo "Removing all packages from $PACKAGES_FOLDER_PATH folder"
-    removeOtherPackages "$PACKAGES_FOLDER_PATH"
+    removeOtherPackages "${PACKAGES_FOLDER_PATH}"
     ls -la $PACKAGES_FOLDER_PATH
   fi
 
@@ -142,7 +154,12 @@ updateBackportBranchContents() {
   echo "Commiting"
   git add $BUILDKITE_FOLDER_PATH
   if [ -d "${JENKINS_FOLDER_PATH}" ]; then
-    git add $JENKINS_FOLDER_PATH
+    git add "${JENKINS_FOLDER_PATH}"
+  fi
+  if [ -d "${MAGEFILE_SCRIPTS_FOLDER}" ] ; then
+    git add ${MAGEFILE_SCRIPTS_FOLDER}
+    git add ${TESTSREPORTER_SCRIPTS_FOLDER}
+    git add go.mod go.sum
   fi
   git add $PACKAGES_FOLDER_PATH/
   git status
@@ -156,7 +173,7 @@ updateBackportBranchContents() {
 
   if [ "$DRY_RUN" == "true" ];then
     echo "DRY_RUN mode, nothing will be pushed."
-    git diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
+    git --no-pager diff $SOURCE_BRANCH...$BACKPORT_BRANCH_NAME
   else
     echo "Pushing..."
     git push origin $BACKPORT_BRANCH_NAME