diff --git a/amd64-container/Dockerfile b/amd64-container/Dockerfile
index 111a394..fa093f3 100644
--- a/amd64-container/Dockerfile
+++ b/amd64-container/Dockerfile
@@ -11,8 +11,9 @@ ARG USER_GID=$USER_UID
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME && chown -R $USERNAME:$USERNAME /opt/debs \
-    && [ -f  /etc/schroot/chroot.d/buildroot ] && chown -R $USERNAME:$USERNAME /var/chroot/buildroot  && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+RUN chown -R $USERNAME:$USERNAME /opt/debs
+RUN [ -f  /etc/schroot/chroot.d/buildroot ] && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
 
 # ********************************************************
 # * Anything else you want to do like clean up goes here *
diff --git a/amd64-container/devcontainer.json b/amd64-container/devcontainer.json
index cb7b0e4..4bcf759 100644
--- a/amd64-container/devcontainer.json
+++ b/amd64-container/devcontainer.json
@@ -29,7 +29,7 @@
 	// Configure tool-specific properties.
 	,
 	"containerEnv": {
-		"CMAKE_GENERATOR": "Ninja"
+		"CMAKE_GENERATOR": "Unix Makefiles"
 	},
 	"customizations": {
 		"vscode": {
diff --git a/arm64-container/Dockerfile b/arm64-container/Dockerfile
index 82f21d7..1b1c9e7 100644
--- a/arm64-container/Dockerfile
+++ b/arm64-container/Dockerfile
@@ -11,8 +11,9 @@ ARG USER_GID=$USER_UID
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME && chown -R $USERNAME:$USERNAME /opt/debs \
-    && [ -f  /etc/schroot/chroot.d/buildroot ] && chown -R $USERNAME:$USERNAME /var/chroot/buildroot  && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+RUN chown -R $USERNAME:$USERNAME /opt/debs
+RUN [ -f  /etc/schroot/chroot.d/buildroot ] && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
 
 # ********************************************************
 # * Anything else you want to do like clean up goes here *
diff --git a/arm64-container/devcontainer.json b/arm64-container/devcontainer.json
index 0dd0bc2..31faad3 100644
--- a/arm64-container/devcontainer.json
+++ b/arm64-container/devcontainer.json
@@ -30,7 +30,7 @@
 	,
 	"containerEnv": {
 		"CMAKE_TOOLCHAIN_FILE": "/usr/share/cmake/toolchain.cmake",
-		"CMAKE_GENERATOR": "Ninja"
+		"CMAKE_GENERATOR": "Unix Makefiles"
 	},
 	"customizations": {
 		"vscode": {
diff --git a/armhf-container/Dockerfile b/armhf-container/Dockerfile
index a5c80d6..da5c9a3 100644
--- a/armhf-container/Dockerfile
+++ b/armhf-container/Dockerfile
@@ -11,8 +11,9 @@ ARG USER_GID=$USER_UID
 RUN groupadd --gid $USER_GID $USERNAME \
     && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
     && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME && chown -R $USERNAME:$USERNAME /opt/debs \
-    && [ -f  /etc/schroot/chroot.d/buildroot ] && chown -R $USERNAME:$USERNAME /var/chroot/buildroot  && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
+    && chmod 0440 /etc/sudoers.d/$USERNAME
+RUN chown -R $USERNAME:$USERNAME /opt/debs
+RUN [ -f  /etc/schroot/chroot.d/buildroot ] && sed -ri "s/(users=.*)/\1,$USERNAME/g" /etc/schroot/chroot.d/buildroot || true
 
 # ********************************************************
 # * Anything else you want to do like clean up goes here *
diff --git a/armhf-container/devcontainer.json b/armhf-container/devcontainer.json
index 6c1e736..23f09cb 100644
--- a/armhf-container/devcontainer.json
+++ b/armhf-container/devcontainer.json
@@ -30,7 +30,7 @@
 	,
 	"containerEnv": {
 		"CMAKE_TOOLCHAIN_FILE": "/usr/share/cmake/toolchain.cmake",
-		"CMAKE_GENERATOR": "Ninja"
+		"CMAKE_GENERATOR": "Unix Makefiles"
 	},
 	"customizations": {
 		"vscode": {