diff --git a/README.md b/README.md
index 3d7d5e2..e6352fc 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 - [alpine-git](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-git)
 - [alpine-mage2postman](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-mage2postman)
 - [alpine-magento-cloud-cli](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-magento-cloud-cli)
-- [alpine-n98-magerun](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-n98-magerun)
+- [alpine-n98-magerun2](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-n98-magerun2)
 - [alpine-nano](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-nano)
 - [alpine-navi](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-navi)
 - [alpine-node](https://github.com/cirolosapio/devcontainers-features/pkgs/container/devcontainers-features%2Falpine-node)
diff --git a/src/alpine-aws-cli/devcontainer-feature.json b/src/alpine-aws-cli/devcontainer-feature.json
index 35b623d..368dfa9 100644
--- a/src/alpine-aws-cli/devcontainer-feature.json
+++ b/src/alpine-aws-cli/devcontainer-feature.json
@@ -1,17 +1,10 @@
 {
   "name": "alpine-aws-cli",
   "id": "alpine-aws-cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Installs aws-cli on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-aws-cli",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/src/alpine-aws-cli/install.sh b/src/alpine-aws-cli/install.sh
index 4ed7288..5865570 100644
--- a/src/alpine-aws-cli/install.sh
+++ b/src/alpine-aws-cli/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-aws-cli'"
 
 apk --no-cache add aws-cli
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   apk --no-cache add aws-cli-zsh-completion
 fi
 
diff --git a/src/alpine-bat/devcontainer-feature.json b/src/alpine-bat/devcontainer-feature.json
index 4c4c4ab..34ef299 100644
--- a/src/alpine-bat/devcontainer-feature.json
+++ b/src/alpine-bat/devcontainer-feature.json
@@ -1,17 +1,10 @@
 {
   "name": "alpine-bat",
   "id": "alpine-bat",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Installs bat on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-bat",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/src/alpine-bat/install.sh b/src/alpine-bat/install.sh
index 3655831..116a27b 100644
--- a/src/alpine-bat/install.sh
+++ b/src/alpine-bat/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-bat'"
 
 apk --no-cache add bat
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   apk --no-cache add bat-zsh-completion
   echo "alias cat=bat" >> $_CONTAINER_USER_HOME/.zshrc
 fi
diff --git a/src/alpine-bottom/devcontainer-feature.json b/src/alpine-bottom/devcontainer-feature.json
index aa3c96e..a0306bf 100644
--- a/src/alpine-bottom/devcontainer-feature.json
+++ b/src/alpine-bottom/devcontainer-feature.json
@@ -1,17 +1,10 @@
 {
   "name": "alpine-bottom",
   "id": "alpine-bottom",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Installs bottom on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-bottom",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/src/alpine-bottom/install.sh b/src/alpine-bottom/install.sh
index 635cf95..e0078fa 100644
--- a/src/alpine-bottom/install.sh
+++ b/src/alpine-bottom/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-bottom'"
 
 apk --no-cache add bottom
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   apk --no-cache add bottom-zsh-completion
 fi
 
diff --git a/src/alpine-broot/devcontainer-feature.json b/src/alpine-broot/devcontainer-feature.json
index 0219086..8a59591 100644
--- a/src/alpine-broot/devcontainer-feature.json
+++ b/src/alpine-broot/devcontainer-feature.json
@@ -1,17 +1,10 @@
 {
   "name": "alpine-broot",
   "id": "alpine-broot",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Installs broot on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-broot",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/src/alpine-broot/install.sh b/src/alpine-broot/install.sh
index bc1fb79..ec3fb18 100644
--- a/src/alpine-broot/install.sh
+++ b/src/alpine-broot/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-broot'"
 
 apk --no-cache add broot
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   apk --no-cache add broot-zsh-completion
 fi
 
diff --git a/src/alpine-deno/devcontainer-feature.json b/src/alpine-deno/devcontainer-feature.json
index 58748ac..686b3e5 100644
--- a/src/alpine-deno/devcontainer-feature.json
+++ b/src/alpine-deno/devcontainer-feature.json
@@ -1,19 +1,12 @@
 {
   "name": "alpine-deno",
   "id": "alpine-deno",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Installs deno on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-deno",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
   ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  },
   "customizations": {
     "vscode": {
       "extensions": [
diff --git a/src/alpine-deno/install.sh b/src/alpine-deno/install.sh
index 2e04c1d..7c6120d 100644
--- a/src/alpine-deno/install.sh
+++ b/src/alpine-deno/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-deno'"
 
 apk --no-cache add deno
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   apk --no-cache add deno-zsh-completion
 fi
 
diff --git a/src/alpine-docker-outside-of-docker/devcontainer-feature.json b/src/alpine-docker-outside-of-docker/devcontainer-feature.json
index db28cf8..80c95d2 100644
--- a/src/alpine-docker-outside-of-docker/devcontainer-feature.json
+++ b/src/alpine-docker-outside-of-docker/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-docker-outside-of-docker",
   "id": "alpine-docker-outside-of-docker",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Re-use the host docker socket, adding the Docker CLI to alpine container",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-docker-outside-of-docker",
   "legacyIds": [
diff --git a/src/alpine-docker-outside-of-docker/install.sh b/src/alpine-docker-outside-of-docker/install.sh
index 527bc3f..88357cf 100644
--- a/src/alpine-docker-outside-of-docker/install.sh
+++ b/src/alpine-docker-outside-of-docker/install.sh
@@ -31,7 +31,7 @@ if [[ $INSTALLDOCKERCOMPOSE == "true" ]]; then
     apk add --no-cache docker-compose
 fi
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
     apk --no-cache add docker-zsh-completion
 fi
 
diff --git a/src/alpine-n98-magerun/devcontainer-feature.json b/src/alpine-n98-magerun/devcontainer-feature.json
deleted file mode 100644
index c5d3c26..0000000
--- a/src/alpine-n98-magerun/devcontainer-feature.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "alpine-n98-magerun",
-  "id": "alpine-n98-magerun",
-  "version": "0.0.12",
-  "description": "Installs n98-magerun on alpine",
-  "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-n98-magerun",
-  "installsAfter": [
-    "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "version": {
-      "type": "string",
-      "default": "7.3.1",
-      "description": "Version of n98-magerun to install",
-      "proposals": [
-        "7.3.1",
-        "6.1.1"
-      ]
-    },
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/alpine-n98-magerun/README.md b/src/alpine-n98-magerun2/README.md
similarity index 100%
rename from src/alpine-n98-magerun/README.md
rename to src/alpine-n98-magerun2/README.md
diff --git a/src/alpine-n98-magerun2/devcontainer-feature.json b/src/alpine-n98-magerun2/devcontainer-feature.json
new file mode 100644
index 0000000..7630de9
--- /dev/null
+++ b/src/alpine-n98-magerun2/devcontainer-feature.json
@@ -0,0 +1,24 @@
+{
+  "name": "alpine-n98-magerun2",
+  "id": "alpine-n98-magerun2",
+  "version": "0.0.13",
+  "description": "Installs n98-magerun2 on alpine",
+  "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-n98-magerun2",
+  "legacyIds": [
+    "alpine-n98-magerun"
+  ],
+  "installsAfter": [
+    "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
+  ],
+  "options": {
+    "version": {
+      "type": "string",
+      "default": "7.3.1",
+      "description": "Version of n98-magerun2 to install",
+      "proposals": [
+        "7.3.1",
+        "6.1.1"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/alpine-n98-magerun/install.sh b/src/alpine-n98-magerun2/install.sh
similarity index 97%
rename from src/alpine-n98-magerun/install.sh
rename to src/alpine-n98-magerun2/install.sh
index cb0d05e..b3f2e9d 100644
--- a/src/alpine-n98-magerun/install.sh
+++ b/src/alpine-n98-magerun2/install.sh
@@ -10,7 +10,7 @@ wget -q https://files.magerun.net/n98-magerun2-${VERSION}.phar -O /usr/local/bin
 # shasum -a256 n98-magerun2.phar
 chmod +x /usr/local/bin/n98-magerun2.phar
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   # ZSH PLUGIN
   mkdir -p $_CONTAINER_USER_HOME/.oh-my-zsh/custom/plugins/n98-magerun2/
   wget -q https://raw.githubusercontent.com/netz98/n98-magerun2/develop/res/autocompletion/zsh/n98-magerun2.plugin.zsh -O $_CONTAINER_USER_HOME/.oh-my-zsh/custom/plugins/n98-magerun2/n98-magerun2.plugin.zsh
diff --git a/src/alpine-navi/devcontainer-feature.json b/src/alpine-navi/devcontainer-feature.json
index 29a3f68..d4fdb4f 100644
--- a/src/alpine-navi/devcontainer-feature.json
+++ b/src/alpine-navi/devcontainer-feature.json
@@ -1,17 +1,10 @@
 {
   "name": "alpine-navi",
   "id": "alpine-navi",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Installs navi on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-navi",
   "installsAfter": [
     "ghcr.io/cirolosapio/devcontainers-features/alpine-ohmyzsh"
-  ],
-  "options": {
-    "initZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Init zsh configs"
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/src/alpine-navi/install.sh b/src/alpine-navi/install.sh
index 18770d6..c013d5b 100644
--- a/src/alpine-navi/install.sh
+++ b/src/alpine-navi/install.sh
@@ -6,7 +6,7 @@ echo "Activating feature 'alpine-navi'"
 
 apk --no-cache add skim navi
 
-if [[ $INITZSH == "true" ]]; then
+if command -v zsh &> /dev/null; then
   echo $'\neval "$(navi widget zsh)"' >> $_CONTAINER_USER_HOME/.zshrc
 fi