diff --git a/Cargo.lock b/Cargo.lock
index 3631dd3717..2342e4cd61 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2563,10 +2563,12 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 [[package]]
 name = "gateway-messages"
 version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/management-gateway-service?branch=epoch#2d9c8eb0931653b78ee849a62f6d2b0662e46845"
 dependencies = [
  "bitflags 2.6.0",
  "hubpack",
  "serde",
+ "serde-big-array 0.5.1",
  "serde_repr",
  "smoltcp",
  "static_assertions",
@@ -2824,11 +2826,11 @@ dependencies = [
 [[package]]
 name = "hubtools"
 version = "0.4.7"
-source = "git+https://github.com/oxidecomputer/hubtools?branch=epoch#38c7a2279f19308b11abc9910a77da548678f437"
+source = "git+https://github.com/oxidecomputer/hubtools?branch=epoch#82669909e9a89ad309da4de24d368481e655dbd8"
 dependencies = [
  "hex",
- "lpc55_areas 0.2.5 (git+https://github.com/oxidecomputer/lpc55_support)",
- "lpc55_sign 0.3.4 (git+https://github.com/oxidecomputer/lpc55_support)",
+ "lpc55_areas",
+ "lpc55_sign",
  "object",
  "path-slash",
  "rsa",
@@ -3234,17 +3236,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "lpc55_areas"
-version = "0.2.5"
-source = "git+https://github.com/oxidecomputer/lpc55_support#131520fc913ecce9b80557e854751953f743a7d2"
-dependencies = [
- "bitfield 0.14.0",
- "clap 4.4.3",
- "packed_struct",
- "serde",
-]
-
 [[package]]
 name = "lpc55_romapi"
 version = "0.1.0"
@@ -3268,32 +3259,7 @@ dependencies = [
  "env_logger",
  "hex",
  "log",
- "lpc55_areas 0.2.5",
- "num-traits",
- "packed_struct",
- "pem-rfc7468",
- "rsa",
- "serde",
- "serde-hex",
- "sha2",
- "thiserror",
- "x509-cert",
- "zerocopy 0.6.6",
-]
-
-[[package]]
-name = "lpc55_sign"
-version = "0.3.4"
-source = "git+https://github.com/oxidecomputer/lpc55_support#131520fc913ecce9b80557e854751953f743a7d2"
-dependencies = [
- "byteorder",
- "const-oid",
- "crc-any",
- "der",
- "env_logger",
- "hex",
- "log",
- "lpc55_areas 0.2.5 (git+https://github.com/oxidecomputer/lpc55_support)",
+ "lpc55_areas",
  "num-traits",
  "packed_struct",
  "pem-rfc7468",
@@ -6213,7 +6179,7 @@ dependencies = [
  "hubtools",
  "indexmap 1.9.1",
  "lpc55-rom-data",
- "lpc55_sign 0.3.4",
+ "lpc55_sign",
  "memchr",
  "multimap",
  "ordered-toml",
diff --git a/app/lpc55xpresso/app-sprot.toml b/app/lpc55xpresso/app-sprot.toml
index 2fe6d99fbd..36d8bf4dbc 100644
--- a/app/lpc55xpresso/app-sprot.toml
+++ b/app/lpc55xpresso/app-sprot.toml
@@ -13,6 +13,7 @@ chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
 fwid = true
+epoch = 0
 
 [kernel]
 name = "lpc55xpresso"
diff --git a/app/lpc55xpresso/app.toml b/app/lpc55xpresso/app.toml
index 12ac78ceeb..1b37db5f2c 100644
--- a/app/lpc55xpresso/app.toml
+++ b/app/lpc55xpresso/app.toml
@@ -5,6 +5,7 @@ chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
 fwid = true
+epoch = 0
 
 [kernel]
 name = "lpc55xpresso"
diff --git a/app/medusa/base.toml b/app/medusa/base.toml
index 0738858031..e87f597a5a 100644
--- a/app/medusa/base.toml
+++ b/app/medusa/base.toml
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
 memory = "memory-large.toml"
 stacksize = 896
 fwid = true
+epoch = 0
 
 [kernel]
 name = "medusa"
diff --git a/app/oxide-rot-1/app.toml b/app/oxide-rot-1/app.toml
index a033cea320..fae7c6c264 100644
--- a/app/oxide-rot-1/app.toml
+++ b/app/oxide-rot-1/app.toml
@@ -4,7 +4,7 @@ board = "oxide-rot-1"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 1
+epoch = 0
 version = 0
 fwid = true
 
diff --git a/app/psc/base.toml b/app/psc/base.toml
index 776bff4056..e3ab711fa9 100644
--- a/app/psc/base.toml
+++ b/app/psc/base.toml
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
 memory = "memory-large.toml"
 stacksize = 896
 fwid = true
+epoch = 0
 
 [kernel]
 name = "psc"
diff --git a/app/rot-carrier/app.toml b/app/rot-carrier/app.toml
index 24430cb117..adeba1a4f7 100644
--- a/app/rot-carrier/app.toml
+++ b/app/rot-carrier/app.toml
@@ -4,7 +4,8 @@ board = "rot-carrier-2"
 chip = "../../chips/lpc55"
 stacksize = 1024
 image-names = ["a", "b"]
-epoch = 3
+# TODO: reset epoch to zero before merge
+epoch = 1
 version = 0
 fwid = true
 
diff --git a/app/sidecar/base.toml b/app/sidecar/base.toml
index 545d2c2120..13fe04ec9b 100644
--- a/app/sidecar/base.toml
+++ b/app/sidecar/base.toml
@@ -3,6 +3,7 @@ chip = "../../chips/stm32h7"
 stacksize = 896
 memory = "memory-large.toml"
 fwid = true
+epoch = 0
 
 [kernel]
 name = "sidecar"