diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index c06fc12..c295b24 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -9,7 +9,7 @@ on:
       - ci-test
 
 env:
-  SO_VERSION: v1.1.0-87fffca-202404110321
+  SO_VERSION: roysc/fix-various
   FIXTURENET_ETH_STACKS_VERSION: plugeth-stack
 
 jobs:
@@ -40,15 +40,31 @@ jobs:
         run: |
           docker build ./plugeth-statediff -t cerc/plugeth-statediff:local
 
-      - name: Install Python
-        uses: actions/setup-python@v5
+      - name: "Install Python for ARM on Linux"
+        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
+        uses: deadsnakes/action@v3.0.1
         with:
           python-version: 3.11
+      - name: "Install Python cases other than ARM on Linux"
+        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+      - name: "Print Python version"
+        run: python3 --version
       - name: Install stack-orchestrator
-        run: |
-          curl -L -O https://github.com/cerc-io/stack-orchestrator/releases/download/$SO_VERSION/laconic-so
-          chmod +x laconic-so
-          echo PATH="$PATH:$(pwd)" >> $GITHUB_ENV
+        # run: |
+        #   curl -L -O https://github.com/cerc-io/stack-orchestrator/releases/download/$SO_VERSION/laconic-so
+        #   chmod +x laconic-so
+        #   echo PATH="$PATH:$(pwd)" >> $GITHUB_ENV
+        # FIXME: merge SO fixes and revert
+        uses: actions/checkout@v3
+        with:
+          repository: cerc-io/stack-orchestrator
+          ref: ${{ env.SO_VERSION }}
+          path: .tools/stack-orchestrator
+      - name: "Install stack orchestrator"
+        run: pip3 install .tools/stack-orchestrator
       - name: Clone system-tests
         uses: actions/checkout@v4
         with: