diff --git a/.github/workflows/aa_basic.yml b/.github/workflows/aa_basic.yml
index d68b06c2e..8c9bda700 100644
--- a/.github/workflows/aa_basic.yml
+++ b/.github/workflows/aa_basic.yml
@@ -3,18 +3,19 @@ name: attestation-agent basic build and unit tests
 on:
   push:
     branches:
-      - "main"
-    paths:
-      - 'attestation-agent/**'
-      - '.github/workflows/aa_basic.yml'
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-  pull_request:
-    paths:
-      - 'attestation-agent/**'
-      - '.github/workflows/aa_basic.yml'
-      - 'Cargo.toml'
-      - 'Cargo.lock'
+      - "final-check-s390x"
+#      - "main"
+#    paths:
+#      - 'attestation-agent/**'
+#      - '.github/workflows/aa_basic.yml'
+#      - 'Cargo.toml'
+#      - 'Cargo.lock'
+#  pull_request:
+#    paths:
+#      - 'attestation-agent/**'
+#      - '.github/workflows/aa_basic.yml'
+#      - 'Cargo.toml'
+#      - 'Cargo.lock'
   #create:
   workflow_dispatch:
 
@@ -35,13 +36,15 @@ jobs:
           - stable
         instance:
           - ubuntu-22.04
-          - s390x
+          - s390x-test
         include:
           - instance: ubuntu-22.04
             make_args: ""
+            cargo_test_opts: "--features openssl,rust-crypto,all-attesters,kbs,coco_as"
             cargo_lint_opts: "--workspace"
-          - instance: s390x
+          - instance: s390x-test
             make_args: "ATTESTER=se-attester TEE_PLATFORM=se"
+            cargo_test_opts: "--no-default-features --features openssl,se-attester,kbs,coco_as"
             cargo_lint_opts: "--no-default-features --features openssl,se-attester,kbs,coco_as -p attestation-agent -p attester -p coco_keyprovider -p kbc -p kbs_protocol -p crypto -p resource_uri"
     runs-on: ${{ matrix.instance }}
     steps:
@@ -87,6 +90,7 @@ jobs:
           eval make ttrpc=true ${MAKE_ARGS} && make install PREFIX=${HOME}/.local
         env:
           MAKE_ARGS: ${{ matrix.make_args }}
+        if: matrix.instance == 'ubuntu-22.04'
 
       - name: Musl build with all platform
         run: |
@@ -97,25 +101,24 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --features openssl,rust-crypto,all-attesters,kbs,coco_as -p attestation-agent -p attester -p coco_keyprovider -p kbc -p kbs_protocol -p crypto -p resource_uri
-        if: matrix.instance == 'ubuntu-22.04'  # will be enabled after https://github.com/confidential-containers/trustee/pull/383
+          args: ${{ matrix.cargo_test_opts }} -p attestation-agent -p attester -p coco_keyprovider -p kbc -p kbs_protocol -p crypto -p resource_uri
 
-      - name: Run cargo fmt check
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+#      - name: Run cargo fmt check
+#        uses: actions-rs/cargo@v1
+#        with:
+#          command: fmt
+#          args: --all -- --check
 
-      - name: Run rust lint check
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          # We are getting error in generated code due to derive_partial_eq_without_eq check, so ignore it for now
-          args: ${{ matrix.cargo_lint_opts }} -- -D warnings -A clippy::derive-partial-eq-without-eq
+#      - name: Run rust lint check
+#        uses: actions-rs/cargo@v1
+#        with:
+#          command: clippy
+#          # We are getting error in generated code due to derive_partial_eq_without_eq check, so ignore it for now
+#          args: ${{ matrix.cargo_lint_opts }} -- -D warnings -A clippy::derive-partial-eq-without-eq
 
-      - name: Take a post-action for self-hosted runner
-        if: always()
-        run: |
-          if [ -f ${HOME}/script/post_action.sh ]; then
-            ${HOME}/script/post_action.sh cc-guest-components
-          fi
+#      - name: Take a post-action for self-hosted runner
+#        if: always()
+#        run: |
+#          if [ -f ${HOME}/script/post_action.sh ]; then
+#            ${HOME}/script/post_action.sh cc-guest-components
+#          fi