diff --git a/.github/workflows/get-ci-image-tag.yml b/.github/workflows/get-ci-image-tag.yml
index 4868a5fcca..2f27f019de 100644
--- a/.github/workflows/get-ci-image-tag.yml
+++ b/.github/workflows/get-ci-image-tag.yml
@@ -3,11 +3,12 @@ name: Get CI Image Tag
 on:
   workflow_call:
     inputs:
-      platform:
-        required: true
+      product:
+        required: false
         type: string
-      usage:
-        required: true
+        default: 'opensearch'
+      platform:
+        required: false
         type: string
       build_ref:
         required: false
@@ -37,7 +38,17 @@ jobs:
       - name: Get ci image version from opensearch-build repository scripts
         id: step-ci-image-version-linux
         run: |
+          PRODUCT=${{ inputs.product }}
+          PLATFORM=${{ inputs.platform }}
+          if [[ -z "$PLATFORM" ]]; then
+              if [[ "$PRODUCT" = "opensearch" ]]; then
+                  PLATFORM="centos7" # Temp measure before centos7 deprecation on opensearch for k-NN
+              else
+                  PLATFORM="rockylinux8"
+              fi
+          fi
           crane version
-          CI_IMAGE_VERSION=`opensearch-build/docker/ci/get-ci-images.sh -p ${{ inputs.platform }} -u ${{ inputs.usage }} -t build | head -1`
+          echo $PRODUCT $PLATFORM
+          CI_IMAGE_VERSION=`opensearch-build/docker/ci/get-ci-images.sh -p $PLATFORM -u $PRODUCT -t build | head -1`
           echo $CI_IMAGE_VERSION
           echo "ci-image-version-linux=$CI_IMAGE_VERSION" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
index c593f57c28..e5e62fa461 100644
--- a/.github/workflows/python-tests.yml
+++ b/.github/workflows/python-tests.yml
@@ -6,9 +6,6 @@ on: [push, pull_request]
 jobs:
   Get-CI-Image-Tag:
     uses: ./.github/workflows/get-ci-image-tag.yml
-    with:
-      platform: centos7
-      usage: opensearch
 
   python-tests:
     strategy:
diff --git a/tests/jenkins/data/opensearch-min-3.0.0-snapshot-windows-build-manifest.yml b/tests/jenkins/data/opensearch-min-3.0.0-snapshot-windows-build-manifest.yml
index 30b0ab5f9a..062b804107 100644
--- a/tests/jenkins/data/opensearch-min-3.0.0-snapshot-windows-build-manifest.yml
+++ b/tests/jenkins/data/opensearch-min-3.0.0-snapshot-windows-build-manifest.yml
@@ -1,4 +1,4 @@
---- # yamllint disable-line rule:new-lines
+---  # yamllint disable-line rule:new-lines
 schema-version: '1.2'
 build:
   name: OpenSearch