diff --git a/.ci/updatecli/bump-logstash-version.yml b/.ci/updatecli/bump-logstash-version.yml
index a100a19aeb8..1dc4186eca3 100644
--- a/.ci/updatecli/bump-logstash-version.yml
+++ b/.ci/updatecli/bump-logstash-version.yml
@@ -56,6 +56,16 @@ targets:
       key: $.logstash-core
       value: '{{ requiredEnv "LOGSTASH_VERSION" }}'
 
+  update_release_track:
+      name: Update logstash-release-track in versions.yml
+      kind: yaml
+      disablesourceinput: true
+      scmid: default
+      spec:
+        file: versions.yml
+        key: $.logstash-release-track
+        value: '{{ requiredEnv "LOGSTASH_RELEASE_TRACK" }}'
+
   update_gemfile_lock_dependency:
     name: Update logstash-core dependency in lockfile
     kind: file
diff --git a/.github/workflows/bump-logstash.yml b/.github/workflows/bump-logstash.yml
index 6679f1ed618..13756814cac 100644
--- a/.github/workflows/bump-logstash.yml
+++ b/.github/workflows/bump-logstash.yml
@@ -11,7 +11,10 @@ on:
         description: 'Logstash branch (example: 9.1)'
         required: true
         type: string
-
+      logstash_release_track:
+        description: 'Release track (example: 9.current, 9.previous, main)'
+        required: true
+        type: string
 jobs:
   bump:
     permissions:
@@ -29,3 +32,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LOGSTASH_BRANCH: "${{ github.event.inputs.logstash_branch }}"
           LOGSTASH_VERSION: "${{ github.event.inputs.logstash_version }}"
+          LOGSTASH_RELEASE_TRACK: "${{ github.event.inputs.logstash_release_track }}"
diff --git a/ci/observabilitySREacceptance_tests.sh b/ci/observabilitySREacceptance_tests.sh
index b999ce1a064..24eb05769f9 100755
--- a/ci/observabilitySREacceptance_tests.sh
+++ b/ci/observabilitySREacceptance_tests.sh
@@ -2,9 +2,12 @@
 
 set -e
 
-QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-export OBSERVABILITY_SRE_IMAGE_VERSION="${OBSERVABILITY_SRE_IMAGE_VERSION:-$QUALIFIED_VERSION}"
-export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$QUALIFIED_VERSION}"
-export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$QUALIFIED_VERSION}"
+# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
+LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
+# Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
+STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
+export OBSERVABILITY_SRE_IMAGE_VERSION="${OBSERVABILITY_SRE_IMAGE_VERSION:-$STACK_VERSION}"
+export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
+export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"
 
 ./gradlew observabilitySREacceptanceTests --stacktrace
diff --git a/ci/observabilitySREsmoke_tests.sh b/ci/observabilitySREsmoke_tests.sh
index 744b2a79efa..bdd475b5dd1 100755
--- a/ci/observabilitySREsmoke_tests.sh
+++ b/ci/observabilitySREsmoke_tests.sh
@@ -3,8 +3,12 @@
 set -e
 
 QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
-export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$QUALIFIED_VERSION}"
-export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$QUALIFIED_VERSION}"
+# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
+LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
+# Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
+STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
+export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
+export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"
 
 ./gradlew --stacktrace artifactDockerObservabilitySRE -PfedrampHighMode=true
 
diff --git a/versions.yml b/versions.yml
index 02422e9021a..c60a0b57ec8 100644
--- a/versions.yml
+++ b/versions.yml
@@ -3,6 +3,9 @@
 logstash: 9.3.0
 logstash-core: 9.3.0
 logstash-core-plugin-api: 2.1.16
+# Logstash release track corresponding to keys in https://github.com/logstash-plugins/.ci/blob/1.x/logstash-versions.yml
+# For example 9.current, 9.previous, etc
+logstash-release-track: main
 
 bundled_jdk:
   # for AdoptOpenJDK/OpenJDK jdk-14.0.1+7.1, the revision is 14.0.1 while the build is 7.1