diff --git a/.github/workflows/activation.yml b/.github/workflows/activation.yml
deleted file mode 100644
index 2c6bc22a..00000000
--- a/.github/workflows/activation.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Acquire activation file
-on: 
-  pull_request:
-    branches:
-    - master
-jobs:
-  activation:
-    name: Request manual activation file 🔑
-    runs-on: ubuntu-latest
-    steps:
-    # Request manual activation file
-    - name: Request manual activation file
-      id: getManualLicenseFile
-      uses: webbertakken/unity-request-manual-activation-file@v1.1
-      with:
-        unityVersion: 2020.1.13f1
-    # Upload artifact (Unity_v20XX.X.XXXX.alf)
-    - name: Expose as artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ steps.getManualLicenseFile.outputs.filePath }}
-        path: ${{ steps.getManualLicenseFile.outputs.filePath }}
diff --git a/.github/workflows/activation2020.yml b/.github/workflows/activation2020.yml
deleted file mode 100644
index f5c3adc7..00000000
--- a/.github/workflows/activation2020.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Acquire activation file for 2020
-
-on:
-  workflow_dispatch: {}
-
-jobs:
-  activation:
-    name: Request manual activation file 🔑
-    runs-on: ubuntu-latest
-    steps:
-      # Request manual activation file
-      - name: Request manual activation file
-        id: getManualLicenseFile
-        uses: game-ci/unity-request-activation-file@v2
-        with:
-          unityVersion: 2020.3.48f1
-      # Upload artifact (Unity_v20XX.X.XXXX.alf)
-      - name: Expose as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
-          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
diff --git a/.github/workflows/activation2021.yml b/.github/workflows/activation2021.yml
deleted file mode 100644
index e7a4e8cd..00000000
--- a/.github/workflows/activation2021.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Acquire activation file for 2021
-
-on:
-  workflow_dispatch: {}
-
-jobs:
-  activation:
-    name: Request manual activation file 🔑
-    runs-on: ubuntu-latest
-    steps:
-      # Request manual activation file
-      - name: Request manual activation file
-        id: getManualLicenseFile
-        uses: game-ci/unity-request-activation-file@v2
-        with:
-          unityVersion: 2021.3.42f1
-      # Upload artifact (Unity_v20XX.X.XXXX.alf)
-      - name: Expose as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
-          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
diff --git a/.github/workflows/activation2022.yml b/.github/workflows/activation2022.yml
deleted file mode 100644
index 1c856b57..00000000
--- a/.github/workflows/activation2022.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Acquire activation file for 2022
-
-on:
-  workflow_dispatch: {}
-
-jobs:
-  activation:
-    name: Request manual activation file 🔑
-    runs-on: ubuntu-latest
-    steps:
-      # Request manual activation file
-      - name: Request manual activation file
-        id: getManualLicenseFile
-        uses: game-ci/unity-request-activation-file@v2
-        with:
-          unityVersion: 2022.3.42f1
-      # Upload artifact (Unity_v20XX.X.XXXX.alf)
-      - name: Expose as artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
-          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4ce5d533..44956ad7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,51 +1,65 @@
-# This is a basic workflow to help you get started with Actions
+name: Unity 2022.3.x Test Runner
 
-name: CI
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
 on:
   pull_request:
     branches:
-    - master
-    - develop
-
-env:
-  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+      - master
+      - beta/**
 
 jobs:
-  testAllModes:
-    name: Test in ${{ matrix.testMode }} on version ${{ matrix.unityVersion }}
+  test:
+    name: Test on Unity ${{ matrix.unityVersion }}
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
-        projectPath:
-          - ./
         unityVersion:
-          - 2020.1.13f1
-        testMode:
-          - all
-#           - playmode
-#           - editmode
+          - 2022.3.42f1
+
     steps:
-      - uses: actions/checkout@v2
+      # リポジトリをチェックアウト
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          lfs: true  # Large File Storageが必要な場合に true を指定
+
+      # Unity Test Runnerを実行 (エディットモードテスト)
+      - name: Run Edit Mode Tests
+        uses: game-ci/unity-test-runner@v4
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          lfs: true
-      - uses: actions/cache@v1.1.0
+          projectPath: ./
+          unityVersion: ${{ matrix.unityVersion }}
+          customParameters: -runTests -testPlatform editmode
+          artifactsPath: editmode-results
+
+      # アーティファクトのアップロード(エディットモード)
+      - name: Upload Edit Mode Test results for ${{ matrix.unityVersion }}
+        uses: actions/upload-artifact@v4
         with:
-          path: ${{ matrix.projectPath }}/Library
-          key: Library-${{ matrix.projectPath }}
-          restore-keys: |
-            Library-
-      - uses: webbertakken/unity-test-runner@v1.4
-        id: tests
+          name: Edit Mode Test results for Unity ${{ matrix.unityVersion }}
+          path: editmode-results
+
+      # Unity Test Runnerを実行 (プレイモードテスト)
+      - name: Run Play Mode Tests
+        uses: game-ci/unity-test-runner@v4
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          projectPath: ${{ matrix.projectPath }}
+          projectPath: ./
           unityVersion: ${{ matrix.unityVersion }}
-          testMode: ${{ matrix.testMode }}
-          artifactsPath: ${{ matrix.testMode }}-artifacts
-      - uses: actions/upload-artifact@v4
+          customParameters: -runTests -testPlatform playmode
+          artifactsPath: playmode-results
+
+      # アーティファクトのアップロード(プレイモード)
+      - name: Upload Play Mode Test results for ${{ matrix.unityVersion }}
+        uses: actions/upload-artifact@v4
         with:
-          name: Test results for ${{ matrix.testMode }}
-          path: ${{ steps.tests.outputs.artifactsPath }}
+          name: Play Mode Test results for Unity ${{ matrix.unityVersion }}
+          path: playmode-results