diff --git a/.drone.yml b/.drone.yml
index d56f993d752..99968ede645 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2747,12 +2747,9 @@ steps:
 - commands:
   - apk add perl
   - v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'`
-  - default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target;
-    fi`
-  - backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`
   - curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr
-  - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${TARGET:-$default_target}
-    -f backport=$${BACKPORT:-$default_backport} --repo=grafana/grafana release-pr.yml
+  - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${v_target}
+    -f latest=$${LATEST} --repo=grafana/grafana release-pr.yml
   depends_on: []
   environment:
     GH_CLI_URL: https://github.com/cli/cli/releases/download/v2.50.0/gh_2.50.0_linux_amd64.tar.gz
@@ -2832,12 +2829,9 @@ steps:
 - commands:
   - apk add perl
   - v_target=`echo $${TAG} | perl -pe 's/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/v\1.\2.x/'`
-  - default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target;
-    fi`
-  - backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`
   - curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr
-  - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${TARGET:-$default_target}
-    -f backport=$${BACKPORT:-$default_backport} --repo=grafana/grafana release-pr.yml
+  - gh workflow run -f dry_run=$${DRY_RUN} -f version=$${TAG} -f target=$${v_target}
+    -f latest=$${LATEST} --repo=grafana/grafana release-pr.yml
   depends_on:
   - publish-artifacts
   - publish-static-assets
@@ -3021,7 +3015,7 @@ steps:
   - rpm --import https://rpm.grafana.com/gpg.key
   - 'echo "Step 4: Configuring Grafana repository..."'
   - |-
-    echo '[grafana]
+    echo -e '[grafana]
     name=grafana
     baseurl=https://rpm.grafana.com
     repo_gpgcheck=0
@@ -3199,7 +3193,7 @@ steps:
   - rpm --import https://rpm.grafana.com/gpg.key
   - 'echo "Step 4: Configuring Grafana repository..."'
   - |-
-    echo '[grafana]
+    echo -e '[grafana]
     name=grafana
     baseurl=https://rpm.grafana.com
     repo_gpgcheck=0
@@ -5122,6 +5116,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: a70ea972fa27e6be2699a188a339e5cead2b8c8ccca9de97e18f41587917dcc7
+hmac: da36d2b066dc30154a3ff1d8a3a643ac46b9e2c871f0d43d4104899d88ab6d58
 
 ...
diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star
index 6672adaa721..94af7b2335c 100644
--- a/scripts/drone/events/release.star
+++ b/scripts/drone/events/release.star
@@ -75,8 +75,6 @@ def release_pr_step(depends_on = []):
         "commands": [
             "apk add perl",
             "v_target=`echo $${{TAG}} | perl -pe 's/{}/v\\1.\\2.x/'`".format(semver_regex),
-            "default_target=`if [[ -n $$LATEST ]]; then echo 'main'; else echo $$v_target; fi`",
-            "backport=`if [[ -n $$LATEST ]]; then echo $$v_target; fi`",
             # Install gh CLI
             "curl -L $${GH_CLI_URL} | tar -xz --strip-components=1 -C /usr",
             # Run the release-pr workflow
@@ -84,9 +82,8 @@ def release_pr_step(depends_on = []):
             "-f dry_run=$${DRY_RUN} " +
             "-f version=$${TAG} " +
             # If the submitter has set a target branch, then use that, otherwise use the default
-            "-f target=$${TARGET:-$default_target} " +
-            # If the submitter has set a backport branch, then use that, otherwise use the default
-            "-f backport=$${BACKPORT:-$default_backport} " +
+            "-f target=$${v_target} " +
+            "-f latest=$${LATEST} " +
             "--repo=grafana/grafana release-pr.yml",
         ],
     }
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 226db199883..e9c16602934 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1219,7 +1219,7 @@ def verify_linux_RPM_packages_step(depends_on = []):
             'echo "Step 3: Adding Grafana GPG key..."',
             "rpm --import https://rpm.grafana.com/gpg.key",
             'echo "Step 4: Configuring Grafana repository..."',
-            "echo '" + repo_config + "' > /etc/yum.repos.d/grafana.repo",
+            "echo -e '" + repo_config + "' > /etc/yum.repos.d/grafana.repo",
             'echo "Step 5: Checking RPM repository..."',
             "dnf list available grafana-${TAG}",
             "if [ $? -eq 0 ]; then",