diff --git a/Containerfile b/Containerfile
index 9e921f3..6ce4838 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,12 +9,12 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Copy custom configuration files
 COPY dot_rizinrc /root/.rizinrc
 
-# Install dependencies and tools
+# Install dependencies and tools, including Neovim
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential jq strace ltrace curl wget rubygems gcc dnsutils \
-    netcat-traditional gcc-multilib net-tools vim gdb gdb-multiarch \
+    netcat-traditional gcc-multilib net-tools neovim gdb gdb-multiarch \
     python3-full python3-pip python3-dev libssl-dev libffi-dev wget git make \
-    procps libpcre3-dev libdb-dev libxt-dev libxaw7-dev emacs-nox tmux && \
+    procps libpcre3-dev libdb-dev libxt-dev libxaw7-dev tmux && \
     pip3 install --break-system-packages capstone requests pwntools r2pipe keystone-engine \
     unicorn ropper meson ninja && \
     mkdir /tools && \