diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet
index d4de1850c1..3e13621aa3 100644
--- a/.drone/drone.jsonnet
+++ b/.drone/drone.jsonnet
@@ -630,17 +630,17 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
         name: 'prepare-updater-config',
         image: 'alpine',
         environment: {
-          RELEASE_BRANCH_REGEXP: '^release-([0-9\\.x]+)$',
+          MAJOR_MINOR_VERSION_REGEXP: '([0-9]+\\.[0-9]+)',
+          RELEASE_TAG_REGEXP: '^([0-9]+\\.[0-9]+\\.[0-9]+)$',
         },
         commands: [
           'apk add --no-cache bash git',
           'git fetch origin --tags',
-          'echo $(./tools/image-tag)',
           'echo $(./tools/image-tag) > .tag',
-          // if the branch name matches the pattern `release-D.D.x` then RELEASE_NAME="D-D-x", otherwise RELEASE_NAME="next"
-          'export RELEASE_NAME=$([[ $DRONE_SOURCE_BRANCH =~ $RELEASE_BRANCH_REGEXP ]] && echo $DRONE_SOURCE_BRANCH | grep -oE "([0-9\\.x]+)" | sed "s/\\./-/g" || echo "next")',
+          'export RELEASE_TAG=$(cat .tag)',
+          // if the tag matches the pattern `D.D.D` then RELEASE_NAME="D-D-x", otherwise RELEASE_NAME="next"
+          'export RELEASE_NAME=$([[ $RELEASE_TAG =~ $RELEASE_TAG_REGEXP ]] && echo $RELEASE_TAG | grep -oE $MAJOR_MINOR_VERSION_REGEXP | sed "s/\\./-/g" | sed "s/$/-x/" || echo "next")',
           'echo $RELEASE_NAME',
-          'export RELEASE_TAG=$(cat .tag) && echo $RELEASE_TAG',
           'echo $PLUGIN_CONFIG_TEMPLATE > %s' % configFileName,
           // replace placeholders with RELEASE_NAME and RELEASE TAG
           'sed -i "s/\\"{{release}}\\"/\\"$RELEASE_NAME\\"/g" %s' % configFileName,
diff --git a/.drone/drone.yml b/.drone/drone.yml
index c8bd53f294..2355b45191 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -1205,19 +1205,20 @@ steps:
 - commands:
   - apk add --no-cache bash git
   - git fetch origin --tags
-  - echo $(./tools/image-tag)
   - echo $(./tools/image-tag) > .tag
-  - export RELEASE_NAME=$([[ $DRONE_SOURCE_BRANCH =~ $RELEASE_BRANCH_REGEXP ]] &&
-    echo $DRONE_SOURCE_BRANCH | grep -oE "([0-9\.x]+)" | sed "s/\./-/g" || echo "next")
+  - export RELEASE_TAG=$(cat .tag)
+  - export RELEASE_NAME=$([[ $RELEASE_TAG =~ $RELEASE_TAG_REGEXP ]] && echo $RELEASE_TAG
+    | grep -oE $MAJOR_MINOR_VERSION_REGEXP | sed "s/\./-/g" | sed "s/$/-x/" || echo
+    "next")
   - echo $RELEASE_NAME
-  - export RELEASE_TAG=$(cat .tag) && echo $RELEASE_TAG
   - echo $PLUGIN_CONFIG_TEMPLATE > updater-config.json
   - sed -i "s/\"{{release}}\"/\"$RELEASE_NAME\"/g" updater-config.json
   - sed -i "s/{{version}}/$RELEASE_TAG/g" updater-config.json
   depends_on:
   - clone
   environment:
-    RELEASE_BRANCH_REGEXP: ^release-([0-9\.x]+)$
+    MAJOR_MINOR_VERSION_REGEXP: ([0-9]+\.[0-9]+)
+    RELEASE_TAG_REGEXP: ^([0-9]+\.[0-9]+\.[0-9]+)$
   image: alpine
   name: prepare-updater-config
   settings:
@@ -1612,6 +1613,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: c0eb47ec65c18d431d2d326925e9f9b6cf4dded08dce0b3f28c969a0a24ac791
+hmac: fa871eb3f76a5fcf0bdf610e6ba80ce402aceb0bfe1a41e3064bb9cf94940c42
 
 ...