diff --git a/beacon_chain/consensus_object_pools/blockchain_dag_light_client.nim b/beacon_chain/consensus_object_pools/blockchain_dag_light_client.nim
index e917f246d..5c92add17 100644
--- a/beacon_chain/consensus_object_pools/blockchain_dag_light_client.nim
+++ b/beacon_chain/consensus_object_pools/blockchain_dag_light_client.nim
@@ -11,25 +11,12 @@ import
   # Status libraries
   stew/bitops2,
   # Beacon chain internals
-  ../spec/datatypes/[phase0, altair, bellatrix, capella, deneb],
+  ../spec/forks,
   ../beacon_chain_db_light_client,
   "."/[block_pools_types, blockchain_dag]
 
 logScope: topics = "chaindag_lc"
 
-type
-  HashedBeaconStateWithSyncCommittee =
-    deneb.HashedBeaconState |
-    capella.HashedBeaconState |
-    bellatrix.HashedBeaconState |
-    altair.HashedBeaconState
-
-  TrustedSignedBeaconBlockWithSyncAggregate =
-    deneb.TrustedSignedBeaconBlock |
-    capella.TrustedSignedBeaconBlock |
-    bellatrix.TrustedSignedBeaconBlock |
-    altair.TrustedSignedBeaconBlock
-
 template nextEpochBoundarySlot(slot: Slot): Slot =
   ## Compute the first possible epoch boundary state slot of a `Checkpoint`
   ## referring to a block at given slot.
@@ -95,8 +82,7 @@ proc existingCurrentSyncCommitteeForPeriod(
     doAssert strictVerification notin dag.updateFlags
   syncCommittee
 
-template syncCommitteeRoot(
-    state: HashedBeaconStateWithSyncCommittee): Eth2Digest =
+template syncCommitteeRoot(state: ForkyHashedBeaconState): Eth2Digest =
   ## Compute a root to uniquely identify `current_sync_committee` and
   ## `next_sync_committee`.
   withEth2Hash:
@@ -436,7 +422,7 @@ proc getLightClientData(
   except KeyError: raiseAssert "Unreachable"
 
 proc cacheLightClientData(
-    dag: ChainDAGRef, state: HashedBeaconStateWithSyncCommittee, bid: BlockId) =
+    dag: ChainDAGRef, state: ForkyHashedBeaconState, bid: BlockId) =
   ## Cache data for a given block and its post-state to speed up creating future
   ## `LightClientUpdate` and `LightClientBootstrap` instances that refer to this
   ## block and state.
@@ -530,8 +516,8 @@ template lazy_bid(name: untyped): untyped {.dirty.} =
 
 proc createLightClientUpdates(
     dag: ChainDAGRef,
-    state: HashedBeaconStateWithSyncCommittee,
-    blck: TrustedSignedBeaconBlockWithSyncAggregate,
+    state: ForkyHashedBeaconState,
+    blck: ForkyTrustedSignedBeaconBlock,
     parent_bid: BlockId,
     data_fork: static LightClientDataFork) =
   ## Create `LightClientUpdate` instances for a given block and its post-state,
@@ -665,8 +651,8 @@ proc createLightClientUpdates(
 
 proc createLightClientUpdates(
     dag: ChainDAGRef,
-    state: HashedBeaconStateWithSyncCommittee,
-    blck: TrustedSignedBeaconBlockWithSyncAggregate,
+    state: ForkyHashedBeaconState,
+    blck: ForkyTrustedSignedBeaconBlock,
     parent_bid: BlockId) =
   # Attested block (parent) determines `LightClientUpdate` fork
   withLcDataFork(dag.cfg.lcDataForkAtEpoch(parent_bid.slot.epoch)):
@@ -781,22 +767,13 @@ proc processNewBlockForLightClient*(
   if signedBlock.message.slot < dag.lcDataStore.cache.tailSlot:
     return
 
-  when signedBlock is deneb.TrustedSignedBeaconBlock:
-    dag.cacheLightClientData(state.denebData, signedBlock.toBlockId())
-    dag.createLightClientUpdates(state.denebData, signedBlock, parentBid)
-  elif signedBlock is capella.TrustedSignedBeaconBlock:
-    dag.cacheLightClientData(state.capellaData, signedBlock.toBlockId())
-    dag.createLightClientUpdates(state.capellaData, signedBlock, parentBid)
-  elif signedBlock is bellatrix.TrustedSignedBeaconBlock:
-    dag.cacheLightClientData(state.bellatrixData, signedBlock.toBlockId())
-    dag.createLightClientUpdates(state.bellatrixData, signedBlock, parentBid)
-  elif signedBlock is altair.TrustedSignedBeaconBlock:
-    dag.cacheLightClientData(state.altairData, signedBlock.toBlockId())
-    dag.createLightClientUpdates(state.altairData, signedBlock, parentBid)
-  elif signedBlock is phase0.TrustedSignedBeaconBlock:
-    raiseAssert "Unreachable" # `tailSlot` cannot be before Altair
+  const consensusFork = typeof(signedBlock).kind
+  when consensusFork >= ConsensusFork.Altair:
+    template forkyState: untyped = state.forky(consensusFork)
+    dag.cacheLightClientData(forkyState, signedBlock.toBlockId())
+    dag.createLightClientUpdates(forkyState, signedBlock, parentBid)
   else:
-    {.error: "Unreachable".}
+    raiseAssert "Unreachable"  # `tailSlot` cannot be before Altair
 
 proc processHeadChangeForLightClient*(dag: ChainDAGRef) =
   ## Update light client data to account for a new head block.
diff --git a/beacon_chain/spec/forks.nim b/beacon_chain/spec/forks.nim
index 009022358..ba57125e4 100644
--- a/beacon_chain/spec/forks.nim
+++ b/beacon_chain/spec/forks.nim
@@ -628,7 +628,7 @@ template withState*(x: ForkedHashedBeaconState, body: untyped): untyped =
     template forkyState: untyped {.inject, used.} = x.phase0Data
     body
 
-template forky(
+template forky*(
     x: ForkedHashedBeaconState, kind: static ConsensusFork): untyped =
   when kind == ConsensusFork.Deneb:
     x.denebData