diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ce3dfc..7859c25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,28 @@
-image: barichello/godot-ci:3.3.3
+image: khaganat/godot-export:3.3.4
 
 stages:
+  - test
   - export
 
 variables:
   EXPORT_NAME: khanat_client
 
+linux64:
+  stage: test
+  tags:
+    - Docker
+  script:
+    - mkdir -v -p $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
+    - godot -v --export "Linux/X11" $EXPORT_NAME_$CI_COMMIT_SHORT_SHA/$EXPORT_NAME_$CI_COMMIT_SHORT_SHA.x86_64
+  artifacts:
+    name: $EXPORT_NAME_$CI_JOB_NAME_$CI_COMMIT_SHORT_SHA
+    paths:
+      - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
+  except:
+    - stable
+    - develop  
+  when: manual
+
 linux64:
   stage: export
   tags:
@@ -19,7 +36,6 @@ linux64:
       - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
   only:
     - merge_requests
-  when: manual
 
 windows:
   stage: export
@@ -34,7 +50,6 @@ windows:
       - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
   only:
     - merge_requests
-  when: manual
 
 mac:
   stage: export
@@ -49,4 +64,3 @@ mac:
       - $EXPORT_NAME_$CI_COMMIT_SHORT_SHA
   only:
     - merge_requests
-  when: manual