diff --git a/docker/assemble.yml b/docker/assemble.yml
new file mode 100644
index 0000000000000..848f48e6da2d5
--- /dev/null
+++ b/docker/assemble.yml
@@ -0,0 +1,28 @@
+version: "3.9"
+
+services:
+
+  wi-assemble:
+    image: wi-assemble:${VERSION}
+    container_name: wi-assemble-${VERSION}
+    build:
+      context: ./..
+      dockerfile: ${REPO_PATH}/docker/images/wi-assemble.Dockerfile
+#    ports:
+#      # OpenSearch REST API
+#      - 9200:9200
+#      # Cross-cluster search
+#      # - 9250:9250
+#      # Node communication and transport
+#      # - 9300:9300
+#      # Performance Analyzer
+#      # - 9600:9600
+#    expose:
+#      - 9200
+    volumes:
+      - ${REPO_PATH}/scripts:/home/wazuh-indexer/scripts
+      - ${REPO_PATH}/artifacts:/home/wazuh-indexer/artifacts
+      - ${REPO_PATH}/distribution/packages/src:/home/wazuh-indexer/distribution/packages/src
+    entrypoint: ['tail', '-f', '/dev/null']
+    user: "1000:1000"
+    working_dir: /home/wazuh-indexer
diff --git a/docker/dev.sh b/docker/dev.sh
index 991ed42de29e7..d1f76e9e69abd 100755
--- a/docker/dev.sh
+++ b/docker/dev.sh
@@ -55,4 +55,4 @@ function main() {
     esac
 }
 
-main "$@"
\ No newline at end of file
+main "$@"
diff --git a/docker/dev.yml b/docker/dev.yml
index 7e3b6202c2ee9..094bd353ace6c 100644
--- a/docker/dev.yml
+++ b/docker/dev.yml
@@ -2,12 +2,12 @@ version: "3.9"
 
 services:
 
-  wazuh-indexer:
-    image: wazuh-indexer-dev:${VERSION}
-    container_name: wazuh-indexer-dev-${VERSION}
+  wi-build:
+    image: wi-build:${VERSION}
+    container_name: wi-build-${VERSION}
     build:
       context: ./..
-      dockerfile: ${REPO_PATH}/docker/images/wi-dev.Dockerfile
+      dockerfile: ${REPO_PATH}/docker/images/wi-build.Dockerfile
     ports:
       # OpenSearch REST API
       - 9200:9200
@@ -24,3 +24,18 @@ services:
     entrypoint: ['tail', '-f', '/dev/null']
     user: "1000:1000"
     working_dir: /home/wazuh-indexer/app
+
+
+  wi-assemble:
+    image: wi-assemble:${VERSION}
+    container_name: wi-assemble-${VERSION}
+    build:
+      context: ./..
+      dockerfile: ${REPO_PATH}/docker/images/wi-assemble.Dockerfile
+    volumes:
+      - ${REPO_PATH}/scripts:/home/wazuh-indexer/scripts
+      - ${REPO_PATH}/artifacts:/home/wazuh-indexer/artifacts
+      - ${REPO_PATH}/distribution/packages/src:/home/wazuh-indexer/distribution/packages/src
+    entrypoint: ['tail', '-f', '/dev/null']
+    user: "1000:1000"
+    working_dir: /home/wazuh-indexer
diff --git a/docker/images/wi-assemble.Dockerfile b/docker/images/wi-assemble.Dockerfile
new file mode 100644
index 0000000000000..b06bed6eaf41a
--- /dev/null
+++ b/docker/images/wi-assemble.Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:jammy
+RUN mkdir /home/wazuh-indexer && \
+    apt-get update -y && \
+    apt-get install curl gnupg2 -y && \
+    curl -o- https://www.aptly.info/pubkey.txt | apt-key add - && \
+    echo "deb http://repo.aptly.info/ squeeze main" | tee -a /etc/apt/sources.list.d/aptly.list && \
+    apt-get update -y && \
+    apt-get upgrade -y && \
+    apt-get install -y aptly build-essential cpio debhelper-compat debmake freeglut3 libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-dev libcairo2 libcairo2-dev libcups2 libdrm2 libgbm-dev libgconf-2-4 libnspr4 libnspr4-dev libnss3 libpangocairo-1.0-0 libxcomposite-dev libxdamage1 libxfixes-dev libxfixes3 libxi6 libxkbcommon-x11-0 libxrandr2 libxrender1 libxtst6 rpm rpm2cpio && \
+    apt-get clean -y && \
+    dpkg -r lintian && \
+    addgroup --gid 1000 wazuh-indexer && \
+    adduser --uid 1000 --ingroup wazuh-indexer --disabled-password --home /home/wazuh-indexer wazuh-indexer && \
+    chmod 0775 /home/wazuh-indexer && \
+    chown -R 1000:1000 /home/wazuh-indexer
+USER wazuh-indexer
+WORKDIR /home/wazuh-indexer
+
+
+
diff --git a/docker/images/wi-dev.Dockerfile b/docker/images/wi-build.Dockerfile
similarity index 100%
rename from docker/images/wi-dev.Dockerfile
rename to docker/images/wi-build.Dockerfile