diff --git a/stacks/analog-xm/arch.Dockerfile b/stacks/analog-xm/arch.Dockerfile
index 111e554..83985bb 100644
--- a/stacks/analog-xm/arch.Dockerfile
+++ b/stacks/analog-xm/arch.Dockerfile
@@ -1,24 +1,15 @@
 # OSIC Stacks - analog-xm-arch
 # Dev enviroment for analog circuits development using xschem and magic.
-FROM greyltc/archlinux-aur:paru
+FROM osicstack-base-arch
 
 # Update packages
-RUN pacman -Syuq --noconfirm
+RUN sudo pacman -Syuq --noconfirm
 
 # Install packages
-RUN aur-install sudo xschem magic python python-pipx xz git gnu-free-fonts
-
-# Install volare
-RUN pipx install volare
+RUN sudo aur-install xschem magic
 
 # Clean cache
-RUN pacman -Scc
-
-# Add main user
-RUN useradd -m designer
-RUN echo "designer ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/designer
-
-USER designer
+RUN sudo pacman -Scc
 
 # Initialize the enviroment keeping container alive
 CMD ["sleep", "infinity"]
\ No newline at end of file