diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5a3509..c4c7232 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
         ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} --spec=downstream
 
   linux-arm:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04 # temporarily downgrade to old ubuntu as 24.04 likes to segfault in the middle of the build for arm build
     strategy:
       matrix:
         arch: [arm64]
diff --git a/crt/s2n b/crt/s2n
index ffe0bf4..6cc9f53 160000
--- a/crt/s2n
+++ b/crt/s2n
@@ -1 +1 @@
-Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb
+Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f