diff --git a/pkg/version/build_test.go b/pkg/version/build_test.go
index d08224e188f..94b9360f50c 100644
--- a/pkg/version/build_test.go
+++ b/pkg/version/build_test.go
@@ -43,4 +43,4 @@ func TestString(t *testing.T) {
 	}
 	expectedOutput := "git-commit=foobar, git-version=v1.2.3, build-date=2024-01-04"
 	assert.Equal(t, expectedOutput, test.String())
-}
+}
\ No newline at end of file
diff --git a/plugin/storage/integration/es_index_cleaner_test.go b/plugin/storage/integration/es_index_cleaner_test.go
index 6a945dfe363..30ad3ff6bee 100644
--- a/plugin/storage/integration/es_index_cleaner_test.go
+++ b/plugin/storage/integration/es_index_cleaner_test.go
@@ -32,8 +32,8 @@ const (
 	samplingIndexName     = "jaeger-sampling-2019-01-01"
 	spanIndexName         = "jaeger-span-2019-01-01"
 	serviceIndexName      = "jaeger-service-2019-01-01"
-	indexCleanerImage     = "jaegertracing/jaeger-es-index-cleaner:latest"
-	rolloverImage         = "jaegertracing/jaeger-es-rollover:1.57.0"
+	indexCleanerImage     = "localhost:5000/jaegertracing/jaeger-es-index-cleaner:local-test"
+	rolloverImage         = "localhost:5000/jaegertracing/jaeger-es-rollover:local-test"
 	rolloverNowEnvVar     = `CONDITIONS='{"max_age":"0s"}'`
 )
 
diff --git a/scripts/es-integration-test.sh b/scripts/es-integration-test.sh
index 0428eac9e41..a9d98d9798e 100755
--- a/scripts/es-integration-test.sh
+++ b/scripts/es-integration-test.sh
@@ -99,6 +99,15 @@ teardown_storage() {
   docker compose -f "${compose_file}" down
 }
 
+build_local_img(){
+    make build-es-index-cleaner GOOS=linux
+    make build-es-rollover GOOS=linux
+    make create-baseimg PLATFORMS="linux/$(go env GOARCH)"
+    #build es-index-cleaner and es-rollover images
+    GITHUB_SHA=local-test BRANCH=local-test bash scripts/build-upload-a-docker-image.sh -l -b -c jaeger-es-index-cleaner -d cmd/es-index-cleaner -t release -p "linux/$(go env GOARCH)"
+    GITHUB_SHA=local-test BRANCH=local-test bash scripts/build-upload-a-docker-image.sh -l -b -c jaeger-es-rollover -d cmd/es-rollover -t release -p "linux/$(go env GOARCH)"
+}
+
 main() {
   check_arg "$@"
   local distro=$1
@@ -108,7 +117,7 @@ main() {
   set -x
 
   bring_up_storage "${distro}" "${es_version}"
-
+  build_local_img
   if [[ "${j_version}" == "v2" ]]; then
     STORAGE=${distro} SPAN_STORAGE_TYPE=${distro} make jaeger-v2-storage-integration-test
   elif [[ "${j_version}" == "v1" ]]; then