diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index f05c0294a86..97966eb2b6e 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -1,6 +1,7 @@
 name: Build Ice
 
 runs:
+  using: "composite"
   steps:
     - name: Build
       run: |
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index f85bcf87aa2..0a4a9c6dd69 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -1,6 +1,7 @@
 name: Test Ice
 
 runs:
+  using: "composite"
   steps:
     - name: Test
       run: python allTests.py --workers=3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5defb44617f..98217fc8978 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,98 +31,20 @@ jobs:
           key: ${{ runner.os }}-build
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
 
+      - name: Window Cache
+        if: startsWith(matrix.os, 'windows')
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/bin
+            **/obj
+          key: ${{ runner.os }}-build-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ github.sha }}
+            ${{ runner.os }}-build-
+
       - name: Build
         uses: ./.github/actions/build
 
       - name: Test
         run: python3 allTests.py --workers=3
-
-  # runs-on: ${{ matrix.os }}
-  # needs: build-ice
-  # steps:
-  #   - name: Configure Test Dependencies
-  #     uses: ./.github/actions/configure-test-dependencies
-  #   - name: Checkout repository
-  #     uses: actions/checkout@v3
-  #   - name: Setup ccache
-  #     uses: hendrikmuhs/ccache-action@v1.2
-  #     with:
-  #       key: ${{ runner.os }}-build
-  #     if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
-  #   - name: Test
-  #     run: python3 allTests.py --workers=3
-
-  # linux-latest:
-  #   runs-on: [ubuntu-latest]
-  #   steps:
-  #     - name: Install dependencies
-  #       run: sudo apt-get install -y python3 python3-pip nodejs libbz2-dev libssl-dev libffi-dev libmcpp-dev libedit-dev liblmdb-dev libexpat1-dev libsystemd-dev openjdk-17-jdk ruby ruby-dev php-cli php-dev
-  #     - name: Install test dependencies
-  #       run: python3 -m pip install passlib cryptography
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-  #     - name: Setup ccache
-  #       uses: hendrikmuhs/ccache-action@v1.2
-  #       with:
-  #         key: ${{ runner.os }}-build
-  #     - name: Build
-  #       run: |
-  #         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-  #         make -j3 V=1
-  #     - name: Test
-  #       run: python3 allTests.py --workers=3
-
-  # macos-latest:
-  #   runs-on: [macos-latest]
-  #   steps:
-  #     - name: Install brew dependencies
-  #       run: brew install python3 ruby openjdk node php lmdb mcpp
-  #     - name: Install test dependencies
-  #       run: python3 -m pip install passlib cryptography
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-  #     - name: Setup ccache
-  #       uses: hendrikmuhs/ccache-action@v1.2
-  #       with:
-  #         key: ${{ runner.os }}-build
-  #     - name: Build
-  #       run: |
-  #         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-  #         make -j3 V=1
-  #     - name: Test
-  #       run: python3 allTests.py --workers=3
-
-  # windows-latest:
-  #   runs-on: [windows-latest]
-  #   steps:
-  #     # - name: Install dependencies
-  #     #   run: choco --yes install
-  #     - name: Setup MSBuild
-  #       uses: microsoft/setup-msbuild@v1.1
-  #       with:
-  #         msbuild-architecture: x64
-  #     - name: Setup Python
-  #       uses: actions/setup-python@v5
-  #       with:
-  #         python-version: "3.12"
-  #     - name: Install test dependencies
-  #       run: python -m pip install passlib cryptography python-dev-tools
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v3
-  #     - name: Cache
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: |
-  #           **/bin
-  #           **/obj
-  #         key: ${{ runner.os }}-build-${{ github.sha }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-build-${{ github.sha }}
-  #           ${{ runner.os }}-build-
-  #     - name: Configure Environment
-  #       run: |
-  #         echo "PythonHome=$env:Python_ROOT_DIR"  >> $env:GITHUB_ENV
-  #     - name: Build
-  #       run: msbuild /m /p:Platform=x64 ice.proj
-  #     - name: Test
-  #       run: python allTests.py --platform=x64 --workers=3