diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1001456f43d0e1745c5bf84a0d9f6445bb634cd6..53632698ba7a83bf968d0f08465d3d80a1596c1d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -90,6 +90,7 @@ RUN cd /home/etsi/dev \
     && git checkout STF525 \
     && cd /home/etsi/dev/STF525_Its/scripts \
     && chmod 775 *.bash devenv.bash.* \
+    && ./update_user_name.sh \
     && cd /home/etsi \
     && ln -sf /home/etsi/dev/STF525_Its/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash \
     && ls -ltr /home/etsi \
diff --git a/scripts/update_user_name.sh b/scripts/update_user_name.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3c33596e5335b609a7d1328cab657134a9b76d6d
--- /dev/null
+++ b/scripts/update_user_name.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Debug mode
+#set -e
+set -vx
+
+# Usage: sudo ./update_user_name.bash
+# TODO Use git clone in temporary directory
+
+USER_NAME='s/vagrant/etsi/g'
+for i in `find /home/etsi/dev/STF525_Its -name "*.cf*"`
+do
+  sed --in-place "${USER_NAME}" $i
+done
+
+exit 0
diff --git a/vagrant/provisioner.bash b/vagrant/provisioner.bash
index 85b680949426441b353fc7ff2eb7fb2ea0b11bc6..dcf5a73610ee35b59efc9c9565d541ed0dc73c83 100755
--- a/vagrant/provisioner.bash
+++ b/vagrant/provisioner.bash
@@ -79,6 +79,7 @@ cd /home/vagrant/dev/STF525_Its/ttcn/LibIts
 git checkout STF525
 cd /home/vagrant/dev/STF525_Its/scripts
 chmod 775 *.bash devenv.bash.*
+./update_user_name.sh
 cd /home/vagrant/dev/STF525_Its/docker
 chmod 775 *.sh
 cd /home/vagrant/dev/STF525_Its