diff --git a/install-fedora-environment.sh b/install-fedora-environment.sh
index 71a32fa9cbda3bc2ff7911a86e1379a07fe84471..21f5d3bc92edeac26c346b28e0379755af57a3c4 100755
--- a/install-fedora-environment.sh
+++ b/install-fedora-environment.sh
@@ -10,6 +10,9 @@ sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
 sudo sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo'
 sudo dnf check-update
 sudo dnf install -y code
+code --install-extension dan-c-underwood.arm --force
+code --install-extension ms-vscode.cpptools --force
+code --install-extension editorconfig.editorconfig --force
 
 #install terminal emulations
 sudo dnf install -y minicom
@@ -64,6 +67,3 @@ echo " - uncomment variable 'WaylandEnable' and ensure it is set to 'false'"
 echo " - add line 'DefaultSession=gnome=xorg.desktop'"
 echo "save the file and restart"
 echo ""
-
-
-
diff --git a/install-ubuntu-environment.sh b/install-ubuntu-environment.sh
index 1d0088afade83f78c07e5999f332c0432f14d848..d1e07a5d1decce729be9664b8a0e360097255aef 100755
--- a/install-ubuntu-environment.sh
+++ b/install-ubuntu-environment.sh
@@ -11,6 +11,9 @@ sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
 sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
 sudo apt update
 sudo apt install -y code
+code --install-extension dan-c-underwood.arm --force
+code --install-extension ms-vscode.cpptools --force
+code --install-extension editorconfig.editorconfig --force
 
 #install terminal emulations
 sudo apt install -y minicom
diff --git a/nano-env b/nano-env
index fa8eb2d205a220e5d3fc7e5bc8d10236cac67336..5e131ea56dc6ac9c001475a1fba7d3c98bdf9ee2 100755
--- a/nano-env
+++ b/nano-env
@@ -10,6 +10,6 @@ mkdir -p ~/workspace/nano
 cd ~/workspace/nano
 git clone git://git.buildroot.net/buildroot
 cd buildroot
-git checkout -b nano 2019.05.1
+git checkout -b nano 2019.08
 patch -p1 < ${SCRIPTDIR}/config/buildroot_nano.patch
 make nanopi_neo_plus2_defconfig