diff --git a/Makefile b/Makefile
index 23510f64a..1e12462b8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ docker_speculos:
 	$(DOCKER) image tag $(LEDGERHQ)/speculos speculos
 
 docker_ledger_app_builder:
-	$(DOCKER) pull $(LEDGERHQ)/ledger-app-builder/ledger-app-builder:3.5.0
-	$(DOCKER) image tag $(LEDGERHQ)/ledger-app-builder/ledger-app-builder:3.5.0 \
+	$(DOCKER) pull $(LEDGERHQ)/ledger-app-builder/ledger-app-builder:3.7.0
+	$(DOCKER) image tag $(LEDGERHQ)/ledger-app-builder/ledger-app-builder:3.7.0 \
 			ledger-app-builder
 
 docker_ledger_app_ocaml:
diff --git a/app/src/apdu_sign.c b/app/src/apdu_sign.c
index a30427a25..9da556b3b 100644
--- a/app/src/apdu_sign.c
+++ b/app/src/apdu_sign.c
@@ -32,7 +32,6 @@
 
 #include "apdu.h"
 #include "apdu_sign.h"
-#include "compat.h"
 #include "globals.h"
 #include "handle_swap.h"
 #include "keys.h"
@@ -196,12 +195,12 @@ refill(void)
         PRINTF("[DEBUG] refill(errno: %s)\n",
                tz_parser_result_name(st->errno));
         // clang-format off
-	switch (st->errno) {
-	case TZ_BLO_IM_FULL: TZ_CHECK(refill_blo_im_full()); break;
-	case TZ_BLO_FEED_ME: TZ_CHECK(send_continue());      break;
-	case TZ_BLO_DONE:    TZ_CHECK(refill_blo_done());    break;
-	default:             TZ_CHECK(refill_error());       break;
-	}
+        switch (st->errno) {
+        case TZ_BLO_IM_FULL: TZ_CHECK(refill_blo_im_full()); break;
+        case TZ_BLO_FEED_ME: TZ_CHECK(send_continue());      break;
+        case TZ_BLO_DONE:    TZ_CHECK(refill_blo_done());    break;
+        default:             TZ_CHECK(refill_error());       break;
+        }
         // clang-format on
     } while (s2s
              && (st->errno == TZ_BLO_IM_FULL
diff --git a/app/src/compat.h b/app/src/compat.h
deleted file mode 100644
index 04f3d84a3..000000000
--- a/app/src/compat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * XXXrcd: Delete this file before the next release.
- * XXXrcd: Delete this file when its incorporated upstream:
- *         https://github.com/LedgerHQ/ledger-secure-sdk/pull/424
- *         it needs to be cherry-picked onto a fork for each arch
- *         so, it should take a couple of weeks
- *         NOTE: this function ignores the offsets because we aren't
- *               using them and we expect to delete this code very
- *               soon...
- */
-
-#include <io.h>
-
-static inline int
-io_send_response_buffers(const buffer_t *rdatalist, size_t count, uint16_t sw)
-{
-    uint8_t buf[128];
-    size_t  tx = 0;
-
-    for (size_t i = 0; i < count; i++) {
-        memcpy(&buf[tx], rdatalist[i].ptr, rdatalist[i].size);
-        tx += rdatalist[i].size;
-    }
-    return io_send_response_pointer(buf, tx, sw);
-}
diff --git a/app/src/handle_swap.c b/app/src/handle_swap.c
index 95d99ae14..b0791bf7b 100644
--- a/app/src/handle_swap.c
+++ b/app/src/handle_swap.c
@@ -23,9 +23,9 @@
 #ifdef HAVE_SWAP
 
 #include <format.h>
+#include <io.h>
 #include <swap.h>
 
-#include "compat.h"
 #include "handle_swap.h"
 #include "keys.h"
 #include "utils.h"
diff --git a/app/src/parser/compat.h b/app/src/parser/compat.h
index c0f982e65..e416d9425 100644
--- a/app/src/parser/compat.h
+++ b/app/src/parser/compat.h
@@ -31,9 +31,6 @@
 #include "os.h"
 #include "os_io_seproxyhal.h"
 #include "cx.h"
-#if CX_APILEVEL < 8
-#error "Only compiles with API level 8 or higher; requires newer firmware"
-#endif
 #else
 #include <stdio.h>
 #define PIC(x) ((void *)x)
diff --git a/docker/Dockerfile.integration-tests b/docker/Dockerfile.integration-tests
index 06b785a8d..b0937e4f4 100644
--- a/docker/Dockerfile.integration-tests
+++ b/docker/Dockerfile.integration-tests
@@ -1,4 +1,4 @@
-FROM ghcr.io/ledgerhq/speculos:sha-6a34680
+FROM ghcr.io/ledgerhq/speculos:sha-bced779
 
 RUN apt update &&                                               \
     apt install -y curl jq build-essential libsodium-dev git &&	\