diff --git a/scripts/wsl_start.ps1 b/scripts/wsl_start.ps1
index ba129f2..e8f2919 100644
--- a/scripts/wsl_start.ps1
+++ b/scripts/wsl_start.ps1
@@ -13,8 +13,10 @@ Write-Host "Please select an image index:"
 $imageoptions = @(
     'analog-xk'
     'analog-xm'
+    'analog-heavy'
     'digital-ator'
     'digital-icarus'
+    'digital-heavy'
     'heavy'
 )
 
@@ -23,7 +25,7 @@ for($i = 0; $i -lt $imageoptions.Length; $i++) {
     Write-Host "$i - $imageoption" -ForegroundColor Cyan
 }
 
-$imageindex = Read-Host -Prompt "Container image to initialize [0-$($imageoptions.Length)]"
+$imageindex = Read-Host -Prompt "Container image to initialize [0-$($imageoptions.Length-1)]"
 $imagename = $imageoptions[$imageindex]
 $containername = Read-Host -Prompt "Container instance name [default=$imagename]"
 if (!$containername) { $containername = $imagename }
diff --git a/stacks/analog-heavy/arch.Dockerfile b/stacks/analog-heavy/arch.Dockerfile
new file mode 100644
index 0000000..9f51732
--- /dev/null
+++ b/stacks/analog-heavy/arch.Dockerfile
@@ -0,0 +1,15 @@
+# OSIC Stacks - analog-heavy-arch
+# Dev enviroment for analog circuits development using xschem and klayout.
+FROM osicstack-base-arch
+
+# Update packages
+RUN sudo pacman -Syuq --noconfirm
+
+# Install packages
+RUN sudo aur-install xschem magic klayout
+
+# Clean cache
+RUN sudo pacman -Scc
+
+# Initialize the enviroment keeping container alive
+CMD ["sleep", "infinity"]
\ No newline at end of file