diff --git a/docker-bake.hcl b/docker-bake.hcl
index ede5e6d6..4c4b5a88 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -155,9 +155,9 @@ target "repository" {
 
 target "search_liveindexing" {
   matrix = {
-    liveindexing = ["metadata", "path", "aio"]
+    liveindexing = ["alfresco-elasticsearch-live-indexing-metadata", "alfresco-elasticsearch-live-indexing-path", "alfresco-elasticsearch-live-indexing"]
   }
-  name = "search_liveindexing-${liveindexing}"
+  name = "${liveindexing}"
   args = {
     LIVEINDEXING = "${liveindexing}"
   }
@@ -170,6 +170,6 @@ target "search_liveindexing" {
     "org.opencontainers.image.title" = "${PRODUCT_LINE} Enterprise Search - ${liveindexing}"
     "org.opencontainers.image.description" = "${PRODUCT_LINE} Enterprise Search - ${liveindexing} live indexing"
   }
-  tags = ["alfresco-elasticsearch-live-indexing-${liveindexing}:latest"]
+  tags = ["${liveindexing}:latest"]
   output = ["type=docker"]
 }
diff --git a/repository/artifacts.json b/repository/artifacts.json
index 6bbaa103..7090e3d7 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -6,8 +6,7 @@
         "version": "23.2.2",
         "path": "repository",
         "classifier": ".zip",
-        "group": "org.alfresco",
-        "name_addon": ""
+        "group": "org.alfresco"
       }
     ]
   }
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifact.sh
index f32d0b3f..5bc86fe7 100755
--- a/scripts/fetch-artifact.sh
+++ b/scripts/fetch-artifact.sh
@@ -16,9 +16,8 @@ for i in $(find . -name artifacts.json -mindepth 2); do
     ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].classifier" $i)
     ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
     ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
-    ARRIFACT_NAME_ADDON=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].name_addon" $i)
     echo "Downloading $ARTIFACT_GROUP:$ARTIFACT_NAME $ARTIFACT_VERSION from $ARTIFACT_BASEURL"
     wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP/\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
-      -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}${ARRIFACT_NAME_ADDON}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
+      -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
   done
 done
diff --git a/search/enterprise/common/Dockerfile b/search/enterprise/common/Dockerfile
index d01c5b87..d525d755 100644
--- a/search/enterprise/common/Dockerfile
+++ b/search/enterprise/common/Dockerfile
@@ -4,7 +4,7 @@ ARG LIVEINDEXING
 ENV PORT=8080
 EXPOSE 8080
 
-ADD search/enterprise/common/*${LIVEINDEXING}*-app.jar /opt/app.jar
+ADD search/enterprise/common/${LIVEINDEXING}*-app.jar /opt/app.jar
 
 HEALTHCHECK --interval=30s --timeout=3s --retries=3 --start-period=1m \
   CMD curl -f http://localhost:8080/actuator/health || exit 1
diff --git a/search/enterprise/common/artifacts.json b/search/enterprise/common/artifacts.json
index 0226f882..d396f06b 100644
--- a/search/enterprise/common/artifacts.json
+++ b/search/enterprise/common/artifacts.json
@@ -6,24 +6,21 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
-        "group": "org.alfresco",
-        "name_addon": ""
+        "group": "org.alfresco"
       },
       {
         "name": "alfresco-elasticsearch-live-indexing-path",
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
-        "group": "org.alfresco",
-        "name_addon": ""
+        "group": "org.alfresco"
       },
       {
         "name": "alfresco-elasticsearch-live-indexing",
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
-        "group": "org.alfresco",
-        "name_addon": "-aio"
+        "group": "org.alfresco"
       }
     ]
   }