diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index ea13ba39a15d14ab077adb7055a116049d209772..6e8e9a22b4c300a96d1fed4605a8b5303bb5be4d 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -152,6 +152,16 @@ retrigger:
 ########## BUILD ############
 #############################
 
+.initENV: &initENV
+  - NEWUS='secous'
+  - groupadd $NEWUS -g 1002 
+  - /usr/bin/restrict_useradd.sh 1002 1002 $NEWUS
+  - groupadd edgehog -g 1023
+  - usermod -a -G edgehog $NEWUS
+  - chown -R :edgehog /var/cache/edgehog_downloads /var/cache/edgehog_sstate
+  - chsh -s /bin/bash $NEWUS
+  - su $NEWUS
+
 .build:
   extends:
     - .infrastructure
@@ -169,8 +179,8 @@ retrigger:
   cache: {}
   retry : 2
   before_script:
-     - NEWUS='secous'; groupadd $NEWUS -g 1002; /usr/bin/restrict_useradd.sh 1002 1002 $NEWUS; chsh -s /bin/bash $NEWUS; su $NEWUS
-  
+      - *initENV
+
   script:
       # init repository and generate configuration files for bitbake
       # checkout
@@ -233,7 +243,7 @@ retrigger:
         fi
 
   artifacts:
-     expire_in: 4 weeks
+     expire_in: 1 week
      paths:
       - $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
       - pathname.txt