diff --git a/.gitignore b/.gitignore
index f3decfd7dfe3f0141276cd7c894054256a4ba2c7..89da29fd7904f484d7b65c7d9e1fef05b9a0994e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ eslint-report.html
 .sass-cache/
 /.secret
 /.vagrant
+/.yarn-cache
 /.byebug_history
 /Vagrantfile
 /backups/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fbfda4a5a872fe04eca9d779150d4da465e5b98..f4f601b4d0e86fe873430899f859834720fadae1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ cache:
   key: "ruby-233"
   paths:
   - vendor/ruby
+  - .yarn-cache
 
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
@@ -186,7 +187,7 @@ setup-test-env:
   stage: prepare
   script:
     - node --version
-    - yarn install --pure-lockfile
+    - yarn install --pure-lockfile --cache-folder .yarn-cache
     - bundle exec rake gitlab:assets:compile
     - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
   artifacts:
@@ -400,7 +401,8 @@ rake gitlab:assets:compile:
     SKIP_STORAGE_VALIDATION: "true"
     WEBPACK_REPORT: "true"
   script:
-    - bundle exec rake yarn:install gitlab:assets:compile
+    - yarn install --pure-lockfile --production --cache-folder .yarn-cache
+    - bundle exec rake gitlab:assets:compile
   artifacts:
     name: webpack-report
     expire_in: 31d