diff --git a/.cirrus.yml b/.cirrus.yml
index 7a68127fd8..aeb8e8c345 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -26,44 +26,3 @@ env:
 #    - python -m ensurepip
 #    - python -m pip install -r requirements.txt
 #    - python -m pytest --interface vtnet0 --root-path=../../Dist/examples_bin
-#
-#task:
-#  name: Test Zstd Linux
-#  container:
-#    image: seladb/ubuntu2004-zstd:latest
-#  configure_script:
-#    - cmake -DLIGHT_PCAPNG_ZSTD=ON -DPCAPPP_BUILD_COVERAGE=ON -S . -B Dist
-#  build_script:
-#    - cmake --build Dist -j 2
-#  test_pcapplusplus_script:
-#    - python3 -m pip install gcovr
-#    - python3 -m pip install -r ci/run_tests/requirements.txt
-#    - python3 ci/run_tests/run_tests.py --interface eth0
-#  coverage_report_script:
-#    - gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
-#    - curl -Os https://uploader.codecov.io/latest/linux/codecov
-#    - chmod +x codecov
-#    - ./codecov -v -f coverage.xml -F zstd -F ubuntu2004 -F unittest || true
-#
-#task:
-#  name: Test Zstd MacOS
-#  macos_instance:
-#    image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1
-#  configure_script:
-#    - brew install zstd
-#    # Ensure user have access to network devices instead of giving super-user right
-#    - sudo chmod a+rw /dev/bpf*
-#    - cmake -DLIGHT_PCAPNG_ZSTD=ON -DPCAPPP_BUILD_COVERAGE=ON -S . -B Dist
-#  build_script:
-#    - cmake --build Dist -j 2
-#  install_tcpreplay_gcovr_script:
-#    - brew install tcpreplay gcovr
-#  test_pcapplusplus_script:
-#    - python3 -m ensurepip
-#    - python3 -m pip install -r ci/run_tests/requirements.txt
-#    - python3 ci/run_tests/run_tests.py --interface en0 --pcap-test-args="-x TestPcapLiveDeviceSpecialCfg"
-#  coverage_report_script:
-#    - gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
-#    - curl -Os https://uploader.codecov.io/latest/macos/codecov
-#    - chmod +x codecov
-#    - ./codecov -v -f coverage.xml -F zstd -F macos-ventura -F unittest || true
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f3044812e2..7fcf99079c 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -63,6 +63,9 @@ jobs:
           - image: ubuntu2004
             python: python3
             config-zstd: OFF
+          - image: ubuntu2004-zstd
+            python: python3
+            config-zstd: ON
           - image: ubuntu1804
             python: python3.8
             config-zstd: OFF
@@ -233,15 +236,22 @@ jobs:
     runs-on: ${{ matrix.os-version }}
     strategy:
       matrix:
-        os-version: [macos-12, macos-13]
-        arch: [x86_64, arm64]
-        # Handle ZSTD build by Cirrus CI
-        # config-zstd: [ON, OFF]
-        config-zstd: [OFF]
-        exclude:
-          # excludes ZSTD on Arm64
-          - arch: arm64
+        include:
+          - os-version: macos-12
+            arch: x86_64
+            config-zstd: OFF
+          - os-version: macos-12
+            arch: arm64
+            config-zstd: OFF
+          - os-version: macos-13
+            arch: x86_64
+            config-zstd: OFF
+          - os-version: macos-13
+            arch: x86_64
             config-zstd: ON
+          - os-version: macos-13
+            arch: arm64
+            config-zstd: OFF
 
     steps:
       - name: Checkout code