diff --git a/opendbc_repo/opendbc/safety/modes/gm.h b/opendbc_repo/opendbc/safety/modes/gm.h
index 5355453972..dc3068866c 100644
--- a/opendbc_repo/opendbc/safety/modes/gm.h
+++ b/opendbc_repo/opendbc/safety/modes/gm.h
@@ -395,11 +395,6 @@ static bool gm_tx_hook(const CANPacket_t *msg) {
     int button = (msg->data[5] >> 4) & 0x7U;
 
     bool allowed_btn = (button == GM_BTN_CANCEL) && cruise_engaged_prev;
-    // Pedal-long non-ACC path: once OP controls are taken over, allow cancel spam
-    // immediately even if cruise_engaged_prev has not flipped yet.
-    if ((button == GM_BTN_CANCEL) && gm_pedal_long && !gm_has_acc && controls_allowed) {
-      allowed_btn = true;
-    }
     if (gm_hw == GM_CAM && enable_gas_interceptor && gm_bolt_2022_pedal && button == GM_BTN_CANCEL) {
       allowed_btn = true;
     }
diff --git a/opendbc_repo/opendbc/safety/tests/test_gm.py b/opendbc_repo/opendbc/safety/tests/test_gm.py
index 355e0021ae..8e99f0feb9 100755
--- a/opendbc_repo/opendbc/safety/tests/test_gm.py
+++ b/opendbc_repo/opendbc/safety/tests/test_gm.py
@@ -391,14 +391,18 @@ class TestGmInterceptorSafety(common.GasInterceptorSafetyTest, TestGmCameraSafet
       self.assertEqual(enable, self.safety.get_controls_allowed())
 
   def test_buttons(self):
-    # Pedal-long non-ACC only allows CANCEL while controls are active.
+    # Pedal-long non-ACC only allows CANCEL when the CC-only cruise state is engaged.
     self.safety.set_controls_allowed(False)
     for btn in range(8):
       self.assertFalse(self._tx(self._button_msg(btn)))
 
     self.safety.set_controls_allowed(True)
     for btn in range(8):
-      self.assertEqual(btn == Buttons.CANCEL, self._tx(self._button_msg(btn)))
+      self.assertFalse(self._tx(self._button_msg(btn)))
+
+    for enabled in (True, False):
+      self._rx(self._pcm_status_msg(enabled))
+      self.assertEqual(enabled, self._tx(self._button_msg(Buttons.CANCEL)))
 
   def test_disable_control_allowed_from_cruise(self):
     pass
@@ -510,7 +514,7 @@ class TestGmCcLongitudinalPandaSchedSafety(TestGmCcLongitudinalSafety):
 
     self.safety.set_controls_allowed(1)
     for btn in range(8):
-      self.assertEqual(btn == Buttons.CANCEL, self._tx(self._button_msg(btn)))
+      self.assertFalse(self._tx(self._button_msg(btn)))
 
     allowed_btns = {Buttons.UNPRESS, Buttons.RES_ACCEL, Buttons.DECEL_SET, Buttons.CANCEL}
     for enabled in (True, False):
diff --git a/panda/board/obj/body_h7.bin.signed b/panda/board/obj/body_h7.bin.signed
index 56ef0889cc..ab3b4d411b 100644
Binary files a/panda/board/obj/body_h7.bin.signed and b/panda/board/obj/body_h7.bin.signed differ
diff --git a/panda/board/obj/body_h7/bootstub.elf b/panda/board/obj/body_h7/bootstub.elf
index b0b86da11b..fd73820f85 100755
Binary files a/panda/board/obj/body_h7/bootstub.elf and b/panda/board/obj/body_h7/bootstub.elf differ
diff --git a/panda/board/obj/body_h7/main.bin b/panda/board/obj/body_h7/main.bin
index 28de00ec8c..05890b4039 100755
Binary files a/panda/board/obj/body_h7/main.bin and b/panda/board/obj/body_h7/main.bin differ
diff --git a/panda/board/obj/body_h7/main.elf b/panda/board/obj/body_h7/main.elf
index 8585b2442a..5b61b1145c 100755
Binary files a/panda/board/obj/body_h7/main.elf and b/panda/board/obj/body_h7/main.elf differ
diff --git a/panda/board/obj/bootstub.body_h7.bin b/panda/board/obj/bootstub.body_h7.bin
index 926cbbe4a3..b5b7eb464c 100755
Binary files a/panda/board/obj/bootstub.body_h7.bin and b/panda/board/obj/bootstub.body_h7.bin differ
diff --git a/panda/board/obj/bootstub.panda.bin b/panda/board/obj/bootstub.panda.bin
index 5189d04a7e..7fac2a6ef4 100755
Binary files a/panda/board/obj/bootstub.panda.bin and b/panda/board/obj/bootstub.panda.bin differ
diff --git a/panda/board/obj/bootstub.panda_h7.bin b/panda/board/obj/bootstub.panda_h7.bin
index 32a7acc2cb..d450e51d43 100755
Binary files a/panda/board/obj/bootstub.panda_h7.bin and b/panda/board/obj/bootstub.panda_h7.bin differ
diff --git a/panda/board/obj/bootstub.panda_h7_remote.bin b/panda/board/obj/bootstub.panda_h7_remote.bin
index 32a7acc2cb..d450e51d43 100755
Binary files a/panda/board/obj/bootstub.panda_h7_remote.bin and b/panda/board/obj/bootstub.panda_h7_remote.bin differ
diff --git a/panda/board/obj/bootstub.panda_jungle_h7.bin b/panda/board/obj/bootstub.panda_jungle_h7.bin
index ec86303caa..3ed48cd10b 100755
Binary files a/panda/board/obj/bootstub.panda_jungle_h7.bin and b/panda/board/obj/bootstub.panda_jungle_h7.bin differ
diff --git a/panda/board/obj/bootstub.panda_remote.bin b/panda/board/obj/bootstub.panda_remote.bin
index 5189d04a7e..7fac2a6ef4 100755
Binary files a/panda/board/obj/bootstub.panda_remote.bin and b/panda/board/obj/bootstub.panda_remote.bin differ
diff --git a/panda/board/obj/gitversion.h b/panda/board/obj/gitversion.h
index d9951076df..7600688307 100644
--- a/panda/board/obj/gitversion.h
+++ b/panda/board/obj/gitversion.h
@@ -1,2 +1,2 @@
 extern const uint8_t gitversion[19];
-const uint8_t gitversion[19] = "DEV-96ce4808-DEBUG";
+const uint8_t gitversion[19] = "DEV-c082d60d-DEBUG";
diff --git a/panda/board/obj/panda.bin.signed b/panda/board/obj/panda.bin.signed
index ac4665d0ec..9089f62e17 100644
Binary files a/panda/board/obj/panda.bin.signed and b/panda/board/obj/panda.bin.signed differ
diff --git a/panda/board/obj/panda/bootstub.elf b/panda/board/obj/panda/bootstub.elf
index 8be03172b3..bc9b354498 100755
Binary files a/panda/board/obj/panda/bootstub.elf and b/panda/board/obj/panda/bootstub.elf differ
diff --git a/panda/board/obj/panda/main.bin b/panda/board/obj/panda/main.bin
index c9ae65def8..5ee01baa6d 100755
Binary files a/panda/board/obj/panda/main.bin and b/panda/board/obj/panda/main.bin differ
diff --git a/panda/board/obj/panda/main.elf b/panda/board/obj/panda/main.elf
index 7219dcdc23..dbcd70570b 100755
Binary files a/panda/board/obj/panda/main.elf and b/panda/board/obj/panda/main.elf differ
diff --git a/panda/board/obj/panda_h7.bin.signed b/panda/board/obj/panda_h7.bin.signed
index 7186741d56..a5764bb514 100644
Binary files a/panda/board/obj/panda_h7.bin.signed and b/panda/board/obj/panda_h7.bin.signed differ
diff --git a/panda/board/obj/panda_h7/bootstub.elf b/panda/board/obj/panda_h7/bootstub.elf
index 77baaebd5d..551ca645e7 100755
Binary files a/panda/board/obj/panda_h7/bootstub.elf and b/panda/board/obj/panda_h7/bootstub.elf differ
diff --git a/panda/board/obj/panda_h7/main.bin b/panda/board/obj/panda_h7/main.bin
index 423b361a66..aec59ee8d3 100755
Binary files a/panda/board/obj/panda_h7/main.bin and b/panda/board/obj/panda_h7/main.bin differ
diff --git a/panda/board/obj/panda_h7/main.elf b/panda/board/obj/panda_h7/main.elf
index a6b8378113..fa805e4627 100755
Binary files a/panda/board/obj/panda_h7/main.elf and b/panda/board/obj/panda_h7/main.elf differ
diff --git a/panda/board/obj/panda_h7_remote.bin.signed b/panda/board/obj/panda_h7_remote.bin.signed
index c8e782650a..fe7d00f79e 100644
Binary files a/panda/board/obj/panda_h7_remote.bin.signed and b/panda/board/obj/panda_h7_remote.bin.signed differ
diff --git a/panda/board/obj/panda_h7_remote/bootstub.elf b/panda/board/obj/panda_h7_remote/bootstub.elf
index 193ac75d95..52119f86d4 100755
Binary files a/panda/board/obj/panda_h7_remote/bootstub.elf and b/panda/board/obj/panda_h7_remote/bootstub.elf differ
diff --git a/panda/board/obj/panda_h7_remote/main.bin b/panda/board/obj/panda_h7_remote/main.bin
index c3195075ce..462eeea265 100755
Binary files a/panda/board/obj/panda_h7_remote/main.bin and b/panda/board/obj/panda_h7_remote/main.bin differ
diff --git a/panda/board/obj/panda_h7_remote/main.elf b/panda/board/obj/panda_h7_remote/main.elf
index 82e427fab2..310224dd78 100755
Binary files a/panda/board/obj/panda_h7_remote/main.elf and b/panda/board/obj/panda_h7_remote/main.elf differ
diff --git a/panda/board/obj/panda_jungle_h7.bin.signed b/panda/board/obj/panda_jungle_h7.bin.signed
index 0bcd309e18..1e26c89d09 100644
Binary files a/panda/board/obj/panda_jungle_h7.bin.signed and b/panda/board/obj/panda_jungle_h7.bin.signed differ
diff --git a/panda/board/obj/panda_jungle_h7/bootstub.elf b/panda/board/obj/panda_jungle_h7/bootstub.elf
index 151ff4debc..def7a19534 100755
Binary files a/panda/board/obj/panda_jungle_h7/bootstub.elf and b/panda/board/obj/panda_jungle_h7/bootstub.elf differ
diff --git a/panda/board/obj/panda_jungle_h7/main.bin b/panda/board/obj/panda_jungle_h7/main.bin
index c5c69bfcad..146e959e64 100755
Binary files a/panda/board/obj/panda_jungle_h7/main.bin and b/panda/board/obj/panda_jungle_h7/main.bin differ
diff --git a/panda/board/obj/panda_jungle_h7/main.elf b/panda/board/obj/panda_jungle_h7/main.elf
index 6251efe80b..a492572026 100755
Binary files a/panda/board/obj/panda_jungle_h7/main.elf and b/panda/board/obj/panda_jungle_h7/main.elf differ
diff --git a/panda/board/obj/panda_remote.bin.signed b/panda/board/obj/panda_remote.bin.signed
index 83a687ba6e..342990a374 100644
Binary files a/panda/board/obj/panda_remote.bin.signed and b/panda/board/obj/panda_remote.bin.signed differ
diff --git a/panda/board/obj/panda_remote/bootstub.elf b/panda/board/obj/panda_remote/bootstub.elf
index cd1c97feac..80ea5c325d 100755
Binary files a/panda/board/obj/panda_remote/bootstub.elf and b/panda/board/obj/panda_remote/bootstub.elf differ
diff --git a/panda/board/obj/panda_remote/main.bin b/panda/board/obj/panda_remote/main.bin
index 7cc612bf9d..0145895946 100755
Binary files a/panda/board/obj/panda_remote/main.bin and b/panda/board/obj/panda_remote/main.bin differ
diff --git a/panda/board/obj/panda_remote/main.elf b/panda/board/obj/panda_remote/main.elf
index 81a879af1d..b87b9e044b 100755
Binary files a/panda/board/obj/panda_remote/main.elf and b/panda/board/obj/panda_remote/main.elf differ
diff --git a/panda/board/obj/version b/panda/board/obj/version
index ab4b446514..b80cde2371 100644
--- a/panda/board/obj/version
+++ b/panda/board/obj/version
@@ -1 +1 @@
-DEV-96ce4808-DEBUG
\ No newline at end of file
+DEV-c082d60d-DEBUG
\ No newline at end of file