diff --git a/CT-Files/z2mqtt/Scripts/Init.sh b/CT-Files/z2mqtt/Scripts/Init.sh
index 1c799bc..97fbab5 100644
--- a/CT-Files/z2mqtt/Scripts/Init.sh
+++ b/CT-Files/z2mqtt/Scripts/Init.sh
@@ -1,25 +1,24 @@
 #!/bin/ash
-#Install corpack globaly for zwavejs2mqtt
-npm install -g corepack
 
 #Run folowing commands as 'node' user
 sudo -u node ash << EOF
 #Install zigbee2mqtt
 git clone https://github.com/Koenkk/zigbee2mqtt.git /opt/node/zigbee2mqtt
 npm --prefix /opt/node/zigbee2mqtt ci
+npm --prefix /opt/node/zigbee2mqtt run build
 ##Update config
 sed -i -e '/port:/c\  port: \/dev\/ttyACM-Zigbee' /opt/node/zigbee2mqtt/data/configuration.yaml
 printf "frontend:\n  port: 5002" >> /opt/node/zigbee2mqtt/data/configuration.yaml
 
 #Install Z-Wave JS UI
 git clone https://github.com/zwave-js/zwave-js-ui /opt/node/ZwaveJsUi
-(cd /opt/node/ZwaveJsUi; yarn install)
-yarn --cwd /opt/node/ZwaveJsUi run build
+npm --prefix /opt/node/ZwaveJsUi install
+npm --prefix /opt/node/ZwaveJsUi run build
 
 #Save PM2 statup config
 pm2 install pm2-logrotate
 pm2 start npm --name zigbee2mqtt --cwd /opt/node/zigbee2mqtt -- start
-pm2 start yarn --name ZwaveJsUi --cwd /opt/node/ZwaveJsUi -- start
+pm2 start npm --name ZwaveJsUi --cwd /opt/node/ZwaveJsUi -- start
 pm2 save
 pm2 kill
 EOF
diff --git a/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh b/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh
index 23a6268..82a5228 100644
--- a/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh
+++ b/CT-Files/z2mqtt/Scripts/Update-ZwaveJsUi.sh
@@ -5,7 +5,7 @@ sudo -u node ash << EOF
 /usr/local/bin/pm2 stop ZwaveJsUi
 cd /opt/node/ZwaveJsUi
 git pull
-/usr/local/bin/yarn install
-/usr/local/bin/yarn run build
+/usr/local/bin/npm install
+/usr/local/bin/npm run build
 /usr/local/bin/pm2 start ZwaveJsUi
 EOF
\ No newline at end of file