diff --git a/src/alpine-bat/devcontainer-feature.json b/src/alpine-bat/devcontainer-feature.json
index 178bb87..d8086b7 100644
--- a/src/alpine-bat/devcontainer-feature.json
+++ b/src/alpine-bat/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-bat",
   "id": "alpine-bat",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Installs bat on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-bat"
 }
\ No newline at end of file
diff --git a/src/alpine-bat/install.sh b/src/alpine-bat/install.sh
index f3f4ca9..a2f42bf 100644
--- a/src/alpine-bat/install.sh
+++ b/src/alpine-bat/install.sh
@@ -6,7 +6,9 @@ echo "Activating feature 'alpine-bat'"
 
 apk --no-cache add bat
 
-su $_CONTAINER_USER
+CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
+echo "Acting as $CURRENT_USER"
+su $CURRENT_USER
 
 echo "alias cat='bat'" >> ~/.profile
 
diff --git a/src/alpine-n98-magerun/devcontainer-feature.json b/src/alpine-n98-magerun/devcontainer-feature.json
index e6dc57e..4333057 100644
--- a/src/alpine-n98-magerun/devcontainer-feature.json
+++ b/src/alpine-n98-magerun/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-n98-magerun",
   "id": "alpine-n98-magerun",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Installs n98-magerun on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-n98-magerun",
   "options": {
diff --git a/src/alpine-n98-magerun/install.sh b/src/alpine-n98-magerun/install.sh
index f636e8c..aa00732 100644
--- a/src/alpine-n98-magerun/install.sh
+++ b/src/alpine-n98-magerun/install.sh
@@ -11,7 +11,9 @@ wget -q https://files.magerun.net/n98-magerun2-${VERSION}.phar -O /usr/local/bin
 chmod +x /usr/local/bin/n98-magerun2.phar
 
 if [[ $INITZSH == "true" ]]; then
-  su $_CONTAINER_USER
+  CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
+  echo "Acting as $CURRENT_USER"
+  su $CURRENT_USER
 
   # ZSH PLUGIN
   mkdir -p ~/.oh-my-zsh/custom/plugins/n98-magerun2/
diff --git a/src/alpine-navi/devcontainer-feature.json b/src/alpine-navi/devcontainer-feature.json
index c291aac..2fac5df 100644
--- a/src/alpine-navi/devcontainer-feature.json
+++ b/src/alpine-navi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-navi",
   "id": "alpine-navi",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Installs navi on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-navi",
   "options": {
diff --git a/src/alpine-navi/install.sh b/src/alpine-navi/install.sh
index 069c049..bc82f3f 100644
--- a/src/alpine-navi/install.sh
+++ b/src/alpine-navi/install.sh
@@ -8,7 +8,9 @@ apk --no-cache add skim
 apk --no-cache add navi --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
 
 if [[ $INITZSH == "true" ]]; then
-  su $_CONTAINER_USER
+  CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
+  echo "Acting as $CURRENT_USER"
+  su $CURRENT_USER
 
   echo $'\neval "$(navi widget zsh)"' >> ~/.zshrc
 fi
diff --git a/src/alpine-nushell/devcontainer-feature.json b/src/alpine-nushell/devcontainer-feature.json
index fd6096f..832a593 100644
--- a/src/alpine-nushell/devcontainer-feature.json
+++ b/src/alpine-nushell/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-nushell",
   "id": "alpine-nushell",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Installs nushell on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-nushell",
   "options": {
diff --git a/src/alpine-nushell/install.sh b/src/alpine-nushell/install.sh
index 82c4a34..54b1fb2 100644
--- a/src/alpine-nushell/install.sh
+++ b/src/alpine-nushell/install.sh
@@ -6,7 +6,9 @@ echo "Activating feature 'alpine-nushell'"
 
 apk --no-cache add nushell --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
 
-su $_CONTAINER_USER
+CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
+echo "Acting as $CURRENT_USER"
+su $CURRENT_USER
 
 mkdir -p ~/.config/nushell/
 wget -q https://raw.githubusercontent.com/nushell/nushell/main/crates/nu-utils/src/sample_config/default_config.nu -O ~/.config/nushell/config.nu
diff --git a/src/alpine-ohmyzsh/devcontainer-feature.json b/src/alpine-ohmyzsh/devcontainer-feature.json
index dc5ca0d..fec4bb9 100644
--- a/src/alpine-ohmyzsh/devcontainer-feature.json
+++ b/src/alpine-ohmyzsh/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "alpine-ohmyzsh",
   "id": "alpine-ohmyzsh",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Installs ohmyzsh on alpine",
   "documentationURL": "https://github.com/cirolosapio/devcontainers-features/tree/main/src/alpine-ohmyzsh",
   "options": {
diff --git a/src/alpine-ohmyzsh/install.sh b/src/alpine-ohmyzsh/install.sh
index 82ca304..af4a146 100644
--- a/src/alpine-ohmyzsh/install.sh
+++ b/src/alpine-ohmyzsh/install.sh
@@ -6,7 +6,9 @@ echo "Activating feature 'alpine-ohmyzsh'"
 
 apk --no-cache add git curl zsh
 
-su $_CONTAINER_USER
+CURRENT_USER=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)
+echo "Acting as $CURRENT_USER"
+su $CURRENT_USER
 
 curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh -s