diff --git a/.dockerignore b/.dockerignore
index df90bf696..09d3015be 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,7 +3,6 @@
 .travis
 .vscode
 .config
-.yarn
 Dockerfile
 build/
 built/
@@ -14,3 +13,10 @@ node_modules/
 redis/
 files/
 misskey-assets/
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 66c10bf85..1c452350b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
     - run: corepack enable
     - run: yarn set version berry
     - run: yarn workspaces foreach install --immutable
-    - run: yarn workspaces foreach run lint
-    env:
+      env:
         YARN_CHECKSUM_BEHAVIOR: update
+    - run: yarn workspaces foreach run lint
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6c7443b04..738392825 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,6 +39,8 @@ jobs:
     - run: corepack enable
     - run: yarn set version berry
     - run: yarn workspaces foreach install --immutable
+      env:
+        YARN_CHECKSUM_BEHAVIOR: update
     - name: Check yarn.lock
       run: git diff --exit-code yarn.lock
     - name: Copy Configure
@@ -47,8 +49,6 @@ jobs:
       run: yarn build
     - name: Test
       run: yarn mocha
-    env:
-        YARN_CHECKSUM_BEHAVIOR: update
 
   e2e:
     runs-on: ubuntu-latest
@@ -89,6 +89,8 @@ jobs:
     - run: corepack enable
     - run: yarn set version berry
     - run: yarn workspaces foreach install --immutable
+      env:
+        YARN_CHECKSUM_BEHAVIOR: update
     - name: Copy Configure
       run: cp .github/misskey/test.yml .config
     - name: Build
@@ -114,5 +116,3 @@ jobs:
       with:
         name: ${{ matrix.browser }}-cypress-videos
         path: cypress/videos
-    env:
-        YARN_CHECKSUM_BEHAVIOR: update