diff --git a/stacks/analog-heavy.Dockerfile b/stacks/analog-heavy.Dockerfile
index 6ba1087..1f4f8fc 100644
--- a/stacks/analog-heavy.Dockerfile
+++ b/stacks/analog-heavy.Dockerfile
@@ -1,6 +1,7 @@
 # OSIC Stacks - analog-heavy-arch
 # Dev enviroment for analog circuits development using xschem and klayout.
-FROM osicstack-base-arch
+ARG BASE_IMG=osicstacks-base-native
+FROM $BASE_IMG as analog-heavy
 
 # Update packages
 RUN sudo pacman -Syuq --noconfirm
@@ -11,5 +12,14 @@ RUN sudo aur-install xschem glu magic klayout
 # Clean cache
 RUN sudo pacman -Scc
 
-# Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
\ No newline at end of file
+# - Desktop build
+FROM analog-heavy as analog-heavy-desktop
+
+# Initialize the environment keeping container alive
+CMD ["sleep", "infinity"]
+
+# - Web build
+FROM analog-heavy as analog-heavy-web
+
+# Run VNC server & desktop environment
+CMD ["startserver"]
diff --git a/stacks/analog-xm.Dockerfile b/stacks/analog-xm.Dockerfile
index 83985bb..f68ba81 100644
--- a/stacks/analog-xm.Dockerfile
+++ b/stacks/analog-xm.Dockerfile
@@ -1,6 +1,7 @@
-# OSIC Stacks - analog-xm-arch
+# OSIC Stacks - analog-xm
 # Dev enviroment for analog circuits development using xschem and magic.
-FROM osicstack-base-arch
+ARG BASE_IMG=osicstacks-base-native
+FROM $BASE_IMG as analog-xm
 
 # Update packages
 RUN sudo pacman -Syuq --noconfirm
@@ -11,5 +12,14 @@ RUN sudo aur-install xschem magic
 # Clean cache
 RUN sudo pacman -Scc
 
-# Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
\ No newline at end of file
+# - Desktop build
+FROM analog-xm as analog-xm-desktop
+
+# Initialize the environment keeping container alive
+CMD ["sleep", "infinity"]
+
+# - Web build
+FROM analog-xm as analog-xm-web
+
+# Run VNC server & desktop environment
+CMD ["startserver"]
diff --git a/stacks/digital-ator.Dockerfile b/stacks/digital-ator.Dockerfile
index abf3f42..fab0739 100644
--- a/stacks/digital-ator.Dockerfile
+++ b/stacks/digital-ator.Dockerfile
@@ -1,6 +1,7 @@
 # OSIC Stacks - analog-xk-arch
 # Dev enviroment for analog circuits development using xschem and klayout.
-FROM osicstack-base-arch
+ARG BASE_IMG=osicstacks-base-native
+FROM $BASE_IMG as digital-ator
 
 # Update packages
 RUN sudo pacman -Syuq --noconfirm
@@ -11,5 +12,14 @@ RUN sudo aur-install verilator gtkwave base-devel cmake
 # Clean cache
 RUN sudo pacman -Scc
 
-# Initialize the enviroment keeping container alive
-CMD ["sleep", "infinity"]
\ No newline at end of file
+# - Desktop build
+FROM digital-ator as digital-ator-desktop
+
+# Initialize the environment keeping container alive
+CMD ["sleep", "infinity"]
+
+# - Web build
+FROM digital-ator as digital-ator-web
+
+# Run VNC server & desktop environment
+CMD ["startserver"]