diff --git a/Dockerfile_5.0-6.0 b/Dockerfile_5.0-6.0
index ffeab7b..b4fdaf8 100644
--- a/Dockerfile_5.0-6.0
+++ b/Dockerfile_5.0-6.0
@@ -44,4 +44,4 @@ USER aosp
 WORKDIR /aosp
 
 #Relogin to set env var such as USER
-CMD sudo -i -u aosp
+CMD sudo -E -iu aosp
diff --git a/Dockerfile_7.0 b/Dockerfile_7.0
index c8b0ae8..f8895ce 100644
--- a/Dockerfile_7.0
+++ b/Dockerfile_7.0
@@ -38,4 +38,4 @@ USER aosp
 WORKDIR /aosp
 
 #Relogin to set env var such as USER
-CMD sudo -iu aosp
+CMD sudo -E -iu aosp
diff --git a/Dockerfile_kitkat b/Dockerfile_kitkat
index 9b62ba9..0972f89 100644
--- a/Dockerfile_kitkat
+++ b/Dockerfile_kitkat
@@ -49,4 +49,4 @@ USER aosp
 WORKDIR /aosp
 
 #Relogin to set env var such as USER
-CMD sudo -i -u aosp
+CMD sudo -E -iu aosp