diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14ba23c..1710e4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,25 +9,18 @@ build_code:
     stage: build
     image: "registry.gitlab.com/mergul/bubel-ecs:latest"
     script:
-        - mkdir build
         - /bin/bash /compile_ecs.sh
-        - cp artifacts/* build/
-        - cp -r public build/
     artifacts: 
         expire_in: 1h
         paths:
-            - build
-    rules:
-        - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
-          when: always
-        - when: always
+            - binaries
     allow_failure: true
 
 test_dmd_debug:
     stage: test    
     image: frolvlad/alpine-glibc
     script:
-        - build/dmd_debug_unittest
+        - binaries/dmd_debug_unittest
     artifacts:
         reports:
             junit: test_report.xml
@@ -35,7 +28,7 @@ test_dmd:
     stage: test    
     image: frolvlad/alpine-glibc
     script:
-        - build/dmd_release_unittest
+        - binaries/dmd_release_unittest
     artifacts:
         reports:
             junit: test_report.xml
@@ -43,7 +36,7 @@ test_dmd_betterC:
     stage: test    
     image: frolvlad/alpine-glibc
     script:
-        - build/dmd_release_unittest_bc
+        - binaries/dmd_release_unittest_bc
     artifacts:
         reports:
             junit: test_report.xml
@@ -56,10 +49,25 @@ coverage_test_dmd:
         - build_code
     script:
         - mkdir reports
-        - build/dmd_unittest_cov
+        - binaries/dmd_unittest_cov
     after_script:
         - bash <(curl -s https://codecov.io/bash) -s reports -t 1a0c0169-a721-4085-8252-fed4755dcd8c
 
+build_wasm:
+    stage: build
+    image: "registry.gitlab.com/mergul/bubel-ecs:latest"
+    script:
+        - /bin/bash /compile_wasm.sh
+        - /bin/bash /gen_doc.sh
+    artifacts: 
+        expire_in: 1h
+        paths:
+            - build
+    rules:
+        - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+          when: always
+    allow_failure: true
+
 emscripten:
     stage: build_emscripten    
     image: "registry.gitlab.com/mergul/bubel-ecs/emscripten:latest"