diff --git a/ChatQnA/Dockerfile.no_wrapper b/ChatQnA/Dockerfile.no_wrapper
index c6adacaee..7e4cd5381 100644
--- a/ChatQnA/Dockerfile.no_wrapper
+++ b/ChatQnA/Dockerfile.no_wrapper
@@ -1,15 +1,12 @@
-
-
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
+    git \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    vim \
-    git
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
diff --git a/ChatQnA/Dockerfile.no_wrapper_without_rerank b/ChatQnA/Dockerfile.no_wrapper_without_rerank
index 0d6c1e34e..9f28f27b6 100644
--- a/ChatQnA/Dockerfile.no_wrapper_without_rerank
+++ b/ChatQnA/Dockerfile.no_wrapper_without_rerank
@@ -1,15 +1,12 @@
-
-
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
 FROM python:3.11-slim
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
+    git \
     libgl1-mesa-glx \
-    libjemalloc-dev \
-    vim \
-    git
+    libjemalloc-dev
 
 RUN useradd -m -s /bin/bash user && \
     mkdir -p /home/user && \
diff --git a/MultimodalQnA/ui/docker/Dockerfile b/MultimodalQnA/ui/docker/Dockerfile
index 7de204e7f..8be5df670 100644
--- a/MultimodalQnA/ui/docker/Dockerfile
+++ b/MultimodalQnA/ui/docker/Dockerfile
@@ -9,11 +9,10 @@ ARG ARCH="cpu"
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
     build-essential \
+    default-jre \
     libgl1-mesa-glx \
     libjemalloc-dev \
-    default-jre \
-    wget \
-    vim
+    wget
 
 # Install ffmpeg static build
 WORKDIR /root
@@ -32,4 +31,3 @@ pip install --no-cache-dir -r /home/user/gradio/requirements.txt
 
 WORKDIR /home/user/gradio
 ENTRYPOINT ["python", "multimodalqna_ui_gradio.py"]
-# ENTRYPOINT ["/usr/bin/sleep", "infinity"]
\ No newline at end of file