diff --git a/.github/workflows/aa_basic.yml b/.github/workflows/aa_basic.yml
index ab0b055a5..f7e3ac22b 100644
--- a/.github/workflows/aa_basic.yml
+++ b/.github/workflows/aa_basic.yml
@@ -36,15 +36,15 @@ jobs:
           - stable
         instance:
           - ubuntu-24.04
-          - s390x
+          #- s390x
           - ubuntu-24.04-arm
         include:
           - instance: ubuntu-24.04
             make_args: ""
             cargo_test_opts: "--features openssl,rust-crypto,all-attesters,kbs,coco_as,ttrpc,grpc"
-          - instance: s390x
-            make_args: "ATTESTER=se-attester TEE_PLATFORM=se"
-            cargo_test_opts: "--no-default-features --features openssl,passport,se-attester,kbs,coco_as"
+          #- instance: s390x
+          #  make_args: "ATTESTER=se-attester TEE_PLATFORM=se"
+          #  cargo_test_opts: "--no-default-features --features openssl,passport,se-attester,kbs,coco_as"
           - instance: ubuntu-24.04-arm
             make_args: "ATTESTER=cca-attester TEE_PLATFORM=cca"
             cargo_test_opts: "--no-default-features --features openssl,rust-crypto,passport,cca-attester,kbs,coco_as,ttrpc,grpc"
diff --git a/.github/workflows/aa_release.yml b/.github/workflows/aa_release.yml
index 6a02fc5e7..d5e67d31c 100644
--- a/.github/workflows/aa_release.yml
+++ b/.github/workflows/aa_release.yml
@@ -3,6 +3,7 @@ name: Cut Release
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 jobs:
   build-and-push-images:
@@ -32,5 +33,5 @@ jobs:
           context: .
           file: ./attestation-agent/docker/Dockerfile.keyprovider
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: false
           tags: ghcr.io/confidential-containers/staged-images/coco-keyprovider:${{ github.sha }}, ghcr.io/confidential-containers/staged-images/coco-keyprovider:latest
diff --git a/.github/workflows/api-server-rest-basic.yml b/.github/workflows/api-server-rest-basic.yml
index 30c6649d1..bda3d98c1 100644
--- a/.github/workflows/api-server-rest-basic.yml
+++ b/.github/workflows/api-server-rest-basic.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         instance:
           - ubuntu-24.04
-          - s390x
+          #- s390x
           - ubuntu-24.04-arm
         rust:
           - stable
diff --git a/.github/workflows/cdh_basic.yml b/.github/workflows/cdh_basic.yml
index c130d1d8f..4ca907751 100644
--- a/.github/workflows/cdh_basic.yml
+++ b/.github/workflows/cdh_basic.yml
@@ -34,7 +34,7 @@ jobs:
       matrix:
         instance:
           - ubuntu-24.04
-          - s390x
+          #- s390x
           - ubuntu-24.04-arm
         rust:
           - stable
diff --git a/.github/workflows/image_rs_build.yml b/.github/workflows/image_rs_build.yml
index 427ce0995..33856e350 100644
--- a/.github/workflows/image_rs_build.yml
+++ b/.github/workflows/image_rs_build.yml
@@ -36,7 +36,7 @@ jobs:
           - stable
         instance:
           - ubuntu-24.04
-          - s390x
+          #- s390x
           - ubuntu-24.04-arm
         # TODO: remove include and exclude when the following issue is resolved
         # https://github.com/rust-lang/rust/issues/135867
diff --git a/.github/workflows/trustee-attester.yml b/.github/workflows/trustee-attester.yml
index 25f319600..a9751b6f3 100644
--- a/.github/workflows/trustee-attester.yml
+++ b/.github/workflows/trustee-attester.yml
@@ -27,13 +27,13 @@ jobs:
           - stable
         instance:
           - ubuntu-24.04
-          - s390x
+          #- s390x
           - ubuntu-24.04-arm
         include:
           - instance: ubuntu-24.04
             cargo_test_opts: "-p kbs_protocol --bin trustee-attester --no-default-features --features background_check,passport,openssl,all-attesters,bin"
-          - instance: s390x
-            cargo_test_opts: "-p kbs_protocol --bin trustee-attester --no-default-features --features background_check,passport,openssl,se-attester,bin"
+          #- instance: s390x
+          #  cargo_test_opts: "-p kbs_protocol --bin trustee-attester --no-default-features --features background_check,passport,openssl,se-attester,bin"
           - instance: ubuntu-24.04-arm
             cargo_test_opts: "-p kbs_protocol --bin trustee-attester --no-default-features --features background_check,passport,openssl,cca-attester,bin"
             # TODO: remove rust: 1.82.0 and exclude when the following issue is resolved