diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e64a1880..d90433ca 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -65,7 +65,7 @@ jobs:
   generate-fstar:
 #     needs: unit-tests
     runs-on: ubuntu-latest
-    container: docker.io/geonnave/hax
+#     container: docker.io/geonnave/hax
 
     steps:
     - uses: actions/checkout@v4
@@ -73,7 +73,9 @@ jobs:
     - name: Generate fstar code using the main library and the hacspec crypto backend
       run: |
         cd edhoc-rs
-        cargo-hax -C -p edhoc-rs -p edhoc-crypto -p edhoc-ead-none --no-default-features --features='crypto-hacspec, ead-none' --release ';' into -i '-c_wrapper::** -edhoc_rs::generate_connection_identifier_cbor -edhoc_rs::generate_connection_identifier' fstar"
+        docker run --rm -v ${{ github.workspace }}:/edhoc-rs hacspec-v2 bash -c "\
+        cargo-hax -C -p edhoc-rs -p edhoc-crypto -p edhoc-ead-none --no-default-features --features='crypto-hacspec, ead-none' --release ';' into -i '-c_wrapper::** -edhoc_rs::generate_connection_identifier_cbor -edhoc_rs::generate_connection_identifier' fstar\
+        "
         zip -j -r edhoc-rs-fstar.zip $(find . -name *fst)
 
     - name: Upload artifact