diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fce194ccf..3818a00e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1176,8 +1176,7 @@ Linux server debian_amd64_buster build:
       - code/ryzom/client/unix
       - code/ryzom/client/windows
       - code/ryzom/tools/scripts/linux
-#    expire_in: 2 week
-  when: manual
+    expire_in: 2 week
 
 
 Linux client debian_amd64_buster build:
@@ -1238,12 +1237,17 @@ Linux client debian_amd64_buster build:
     - (cd code/build ; cmake -DWITH_NEL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=ON ..)
     - (cd code/build; make khanat_client)
     - (cd code/build/bin; ls -lh)
+    - mkdir -p Linux/x86_64
+    - cp code/bin/* Linux/x86_64
+    # Packaging
+    - cp ./dist/khanat/autoextract_script.sh ./Linux/x86_64/
+    - chmod +x ./Linux/x86_64/autoextract_script.sh
+    - makeself --nox11 --target /tmp/khanat_installer ./Linux/x86_64/ khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run "Khanat installer" ./autoextract_script.sh
   artifacts:
     name: "khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID"
     paths:
       - code/build/bin
-#    expire_in: 2 week
-  when: manual
+    expire_in: 2 week
 
 
 
@@ -1334,8 +1338,7 @@ Linux client_appimage debian_amd64_buster build:
     name: "khanat-client_appimage-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID"
     paths:
       - code/build/Khanat-x86_64.AppImage
-#    expire_in: 2 week
-  when: manual
+    expire_in: 2 week
 
 
 
@@ -1416,7 +1419,7 @@ Linux client test:
   image: ubuntu:18.04
   script:
     # Test de l'installation initiale
-    - ./khanat-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run
+    - ./khanat-client-debian_buster-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID-Linux-x86_64.run
   dependencies:
     - Linux client build