diff --git a/bin/postStart b/bin/postStart
index 73dce7f..8be544d 100755
--- a/bin/postStart
+++ b/bin/postStart
@@ -3,9 +3,9 @@
 set -ex
 sudo useradd "${ECLAIR_LICENSE_USER}" -u 2000 || :
 sudo mkdir -p /var/hasplm/update
-sudo chown eclair -R /var/hasplm
+sudo chown buildslave -R /var/hasplm
 sudo mkdir -p /etc/hasplm
-sudo chown -R eclair /etc/hasplm
+sudo chown -R buildslave /etc/hasplm
 echo "serveraddr = ${ECLAIR_LICENSE_SERVER}" > /etc/hasplm/hasplm.ini
 cp -f "${ECLAIR_TOP_DIR}"/reqs/Sentinel_LDK_RTE/haspvlib*_113938.* /var/hasplm/update
 sudo /usr/sbin/hasplmd -s
diff --git a/eclair-tf-a-3.13/Dockerfile b/eclair-tf-a-3.13/Dockerfile
index dab22d6..ccae0ae 100644
--- a/eclair-tf-a-3.13/Dockerfile
+++ b/eclair-tf-a-3.13/Dockerfile
@@ -53,11 +53,6 @@
 
 ENV PATH ${PATH}:${ECLAIR_TOP_DIR}/../bin:${ECLAIR_TOP_DIR}/bin
 
-RUN apt-get install -y -q sudo && \
-    useradd -m eclair -s /bin/bash && \
-    echo "eclair ALL=NOPASSWD: ALL" > /etc/sudoers.d/eclair
-
-
 RUN rm -rf /var/hasplm/storage
 
 RUN apt-get update && \
@@ -76,9 +71,6 @@
 
 RUN bash -ex /tmp/tf-environment.install
 
-
-USER eclair
-
 COPY bin/ /opt/bugseng/bin
 
 EXPOSE 22
diff --git a/eclair-tf-m-3.13/Dockerfile b/eclair-tf-m-3.13/Dockerfile
index a167edc..681924b 100644
--- a/eclair-tf-m-3.13/Dockerfile
+++ b/eclair-tf-m-3.13/Dockerfile
@@ -53,11 +53,6 @@
 
 ENV PATH ${PATH}:${ECLAIR_TOP_DIR}/../bin:${ECLAIR_TOP_DIR}/bin
 
-RUN apt-get install -y -q sudo && \
-    useradd -m eclair -s /bin/bash && \
-    echo "eclair ALL=NOPASSWD: ALL" > /etc/sudoers.d/eclair
-
-
 RUN rm -rf /var/hasplm/storage
 
 RUN apt-get update && \
@@ -76,9 +71,6 @@
 
 RUN bash -ex /tmp/tf-environment.install
 
-
-USER eclair
-
 COPY bin/ /opt/bugseng/bin
 
 EXPOSE 22