diff --git a/cabal.project b/cabal.project
index 82974c14754..6a23a6acbc1 100644
--- a/cabal.project
+++ b/cabal.project
@@ -326,92 +326,92 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-network
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: io-sim
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-consensus
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-consensus/ouroboros-consensus-mock
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-consensus-byron
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-consensus-shelley
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-consensus-cardano
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: typed-protocols
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: typed-protocols-examples
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: ouroboros-network-framework
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: network-mux
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: io-sim-classes
 
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: dae680f8e6b0af611c323554c375f50b3bfd5308
-  --sha256: 06431j67milg51ih1wpac829fniw0qlbzzj9vc1xshn445b5vy4n
+  tag: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
+  --sha256: 02rgckwkkc705p8f6kh7f882jipgj8xmbz20360grpwhln2cdqgv
   subdir: Win32-network
 
 source-repository-package
diff --git a/cardano-api/src/Cardano/Api/Protocol/Byron.hs b/cardano-api/src/Cardano/Api/Protocol/Byron.hs
index 9e7c4edf076..ece3dfcb3d0 100644
--- a/cardano-api/src/Cardano/Api/Protocol/Byron.hs
+++ b/cardano-api/src/Cardano/Api/Protocol/Byron.hs
@@ -9,18 +9,18 @@ module Cardano.Api.Protocol.Byron
 import           Cardano.Chain.Slotting (EpochSlots)
 
 import           Ouroboros.Consensus.Cardano
-                   (ProtocolClient(ProtocolClientRealPBFT), ProtocolRealPBFT,
+                   (ProtocolClient(ProtocolClientByron), ProtocolByron,
                     SecurityParam)
-import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
+import           Ouroboros.Consensus.Cardano.ByronHFC
 
 import           Cardano.Api.Protocol.Types (SomeNodeClientProtocol(..))
 
 
 mkNodeClientProtocolByron :: EpochSlots
                           -> SecurityParam
-                          -> ProtocolClient ByronBlock ProtocolRealPBFT
+                          -> ProtocolClient ByronBlockHFC ProtocolByron
 mkNodeClientProtocolByron epochSlots securityParam =
-    ProtocolClientRealPBFT epochSlots securityParam
+    ProtocolClientByron epochSlots securityParam
 
 
 mkSomeNodeClientProtocolByron :: EpochSlots
diff --git a/cardano-api/src/Cardano/Api/Protocol/Shelley.hs b/cardano-api/src/Cardano/Api/Protocol/Shelley.hs
index 41bf514cc9c..a500e13c122 100644
--- a/cardano-api/src/Cardano/Api/Protocol/Shelley.hs
+++ b/cardano-api/src/Cardano/Api/Protocol/Shelley.hs
@@ -8,18 +8,18 @@ module Cardano.Api.Protocol.Shelley
 
 
 import           Ouroboros.Consensus.Cardano
-                   (ProtocolClient(ProtocolClientRealTPraos), ProtocolRealTPraos)
+                   (ProtocolClient(ProtocolClientShelley), ProtocolShelley)
+import           Ouroboros.Consensus.Cardano.ShelleyHFC
 
-import           Ouroboros.Consensus.Shelley.Ledger
 import           Ouroboros.Consensus.Shelley.Protocol (TPraosStandardCrypto)
 
 import           Cardano.Api.Protocol.Types (SomeNodeClientProtocol(..))
 
 
 mkNodeClientProtocolShelley :: ProtocolClient
-                                 (ShelleyBlock TPraosStandardCrypto)
-                                 ProtocolRealTPraos
-mkNodeClientProtocolShelley = ProtocolClientRealTPraos
+                                 (ShelleyBlockHFC TPraosStandardCrypto)
+                                 ProtocolShelley
+mkNodeClientProtocolShelley = ProtocolClientShelley
 
 
 mkSomeNodeClientProtocolShelley :: SomeNodeClientProtocol
diff --git a/cardano-api/src/Cardano/Api/TxSubmit.hs b/cardano-api/src/Cardano/Api/TxSubmit.hs
index 34f9cf9d685..9874343d9d0 100644
--- a/cardano-api/src/Cardano/Api/TxSubmit.hs
+++ b/cardano-api/src/Cardano/Api/TxSubmit.hs
@@ -1,10 +1,11 @@
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE GADTs #-}
 {-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE FlexibleInstances #-}
 
 module Cardano.Api.TxSubmit
   ( submitTx
@@ -27,6 +28,7 @@ import           Ouroboros.Consensus.Cardano.Block
                    (GenTx (GenTxByron, GenTxShelley),
                     CardanoApplyTxErr, HardForkApplyTxErr (ApplyTxErrByron,
                       ApplyTxErrShelley, ApplyTxErrWrongEra))
+import           Ouroboros.Consensus.HardFork.Combinator.Degenerate
 
 import           Cardano.Api.Typed
 import           Cardano.Api.TxSubmit.ErrorRender
@@ -75,18 +77,22 @@ submitTx :: forall mode block.
 submitTx connctInfo txformode =
     case (localNodeConsensusMode connctInfo, txformode) of
       (ByronMode{}, TxForByronMode (ByronTx tx)) -> do
-        let genTx = Byron.ByronTx (Byron.byronIdTx tx) tx
+        let genTx = DegenGenTx (Byron.ByronTx (Byron.byronIdTx tx) tx)
         result <- submitTxToNodeLocal connctInfo genTx
         case result of
-          SubmitSuccess      -> return TxSubmitSuccess
-          SubmitFail failure -> return (TxSubmitFailureByronMode failure)
+          SubmitSuccess ->
+            return TxSubmitSuccess
+          SubmitFail (DegenApplyTxErr failure) ->
+            return (TxSubmitFailureByronMode failure)
 
       (ShelleyMode{}, TxForShelleyMode (ShelleyTx tx)) -> do
-        let genTx = mkShelleyTx tx
+        let genTx = DegenGenTx (mkShelleyTx tx)
         result <- submitTxToNodeLocal connctInfo genTx
         case result of
-          SubmitSuccess      -> return TxSubmitSuccess
-          SubmitFail failure -> return (TxSubmitFailureShelleyMode failure)
+          SubmitSuccess ->
+            return TxSubmitSuccess
+          SubmitFail (DegenApplyTxErr failure) ->
+            return (TxSubmitFailureShelleyMode failure)
 
       (CardanoMode{}, TxForCardanoMode etx) -> do
         let genTx = case etx of
diff --git a/cardano-api/src/Cardano/Api/Typed.hs b/cardano-api/src/Cardano/Api/Typed.hs
index 780f26f8bed..8548983e788 100644
--- a/cardano-api/src/Cardano/Api/Typed.hs
+++ b/cardano-api/src/Cardano/Api/Typed.hs
@@ -392,8 +392,8 @@ import           Ouroboros.Consensus.Node.NetworkProtocolVersion
                    supportedNodeToClientVersions)
 import           Ouroboros.Consensus.Node.Run (SerialiseNodeToClientConstraints)
 
-import           Ouroboros.Consensus.Byron.Ledger.Block (ByronBlock)
-import           Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)
+import           Ouroboros.Consensus.Cardano.ByronHFC (ByronBlockHFC)
+import           Ouroboros.Consensus.Cardano.ShelleyHFC (ShelleyBlockHFC)
 import           Ouroboros.Consensus.Cardano.Block (CardanoBlock)
 
 --
@@ -2312,10 +2312,10 @@ data NodeConsensusMode mode block where
      ByronMode
        :: Byron.EpochSlots
        -> SecurityParam
-       -> NodeConsensusMode ByronMode ByronBlock
+       -> NodeConsensusMode ByronMode ByronBlockHFC
 
      ShelleyMode
-       :: NodeConsensusMode ShelleyMode (ShelleyBlock ShelleyCrypto)
+       :: NodeConsensusMode ShelleyMode (ShelleyBlockHFC ShelleyCrypto)
 
      CardanoMode
        :: Byron.EpochSlots
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Query.hs b/cardano-cli/src/Cardano/CLI/Byron/Query.hs
index 87e87b65578..0c1cd4dfbad 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Query.hs
@@ -25,6 +25,8 @@ import           Cardano.Config.Types (SocketPath (..))
 import           Cardano.Api.LocalChainSync (getLocalTip)
 import           Cardano.CLI.Environment
                    (EnvSocketError, readEnvSocketPath, renderEnvSocketError)
+import           Cardano.TracingOrphanInstances.HardFork ()
+
 
 data ByronQueryError
   = ByronQueryEnvVarSocketErr !EnvSocketError
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
index 5b3eee55119..a0b24bea1ac 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs
@@ -48,6 +48,8 @@ import qualified Cardano.Crypto.Signing as Crypto
 import qualified Ouroboros.Consensus.Byron.Ledger as Byron
 import           Ouroboros.Consensus.Byron.Ledger (GenTx(..), ByronBlock)
 import           Ouroboros.Consensus.Cardano (SecurityParam(..))
+import           Ouroboros.Consensus.HardFork.Combinator.Degenerate
+                   (GenTx(DegenGenTx))
 
 import           Cardano.Api.Typed
                    (NetworkId, LocalNodeConnectInfo(..), NodeConsensusMode(..),
@@ -203,7 +205,7 @@ nodeSubmitTx network gentx = do
                                        (EpochSlots 21600)
                                        (SecurityParam 2160)
           }
-    _res <- liftIO $ submitTxToNodeLocal connctInfo gentx
+    _res <- liftIO $ submitTxToNodeLocal connctInfo (DegenGenTx gentx)
     --TODO: print failures
     return ()
 
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
index 9e3bc4d33d9..8ba40aedf85 100644
--- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -55,6 +55,8 @@ import           Cardano.Config.Types (SocketPath(..))
 import           Cardano.Binary (decodeFull)
 
 import           Ouroboros.Consensus.Cardano.Block (Either (..), EraMismatch (..), Query (..))
+import           Ouroboros.Consensus.HardFork.Combinator.Degenerate
+                   (Query (DegenQuery), Either (DegenQueryResult))
 import           Ouroboros.Consensus.Shelley.Protocol.Crypto (TPraosStandardCrypto)
 import           Ouroboros.Network.Block (getTipPoint)
 
@@ -349,10 +351,11 @@ queryUTxOFromLocalState qFilter connectInfo@LocalNodeConnectInfo{localNodeConsen
 
     ShelleyMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
-      firstExceptT AcquireFailureError . newExceptT $
+      DegenQueryResult result <- firstExceptT AcquireFailureError . newExceptT $
         queryNodeLocalState
           connectInfo
-          (getTipPoint tip, applyUTxOFilter qFilter)
+          (getTipPoint tip, DegenQuery (applyUTxOFilter qFilter))
+      return result
 
     CardanoMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
@@ -421,10 +424,11 @@ queryPParamsFromLocalState connectInfo@LocalNodeConnectInfo{
                              localNodeConsensusMode = ShelleyMode
                            } = do
     tip <- liftIO $ getLocalTip connectInfo
-    firstExceptT AcquireFailureError . newExceptT $
+    DegenQueryResult result <- firstExceptT AcquireFailureError . newExceptT $
       queryNodeLocalState
         connectInfo
-        (getTipPoint tip, GetCurrentPParams)
+        (getTipPoint tip, DegenQuery GetCurrentPParams)
+    return result
 
 queryPParamsFromLocalState connectInfo@LocalNodeConnectInfo{
                              localNodeConsensusMode = CardanoMode{}
@@ -456,10 +460,11 @@ queryStakeDistributionFromLocalState connectInfo@LocalNodeConnectInfo{
                                        localNodeConsensusMode = ShelleyMode{}
                                      } = do
   tip <- liftIO $ getLocalTip connectInfo
-  firstExceptT AcquireFailureError . newExceptT $
+  DegenQueryResult result <- firstExceptT AcquireFailureError . newExceptT $
     queryNodeLocalState
       connectInfo
-      (getTipPoint tip, GetStakeDistribution)
+      (getTipPoint tip, DegenQuery GetStakeDistribution)
+  return result
 
 queryStakeDistributionFromLocalState connectInfo@LocalNodeConnectInfo{
                                        localNodeConsensusMode = CardanoMode{}
@@ -483,11 +488,14 @@ queryLocalLedgerState connectInfo@LocalNodeConnectInfo{localNodeConsensusMode} =
 
     ShelleyMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
-      fmap decodeLedgerState $
-        firstExceptT AcquireFailureError . newExceptT $
+      DegenQueryResult result <- firstExceptT AcquireFailureError . newExceptT $
           queryNodeLocalState
             connectInfo
-            (getTipPoint tip, GetCBOR GetCurrentEpochState) -- Get CBOR-in-CBOR version
+            ( getTipPoint tip
+            , DegenQuery $
+                GetCBOR GetCurrentEpochState  -- Get CBOR-in-CBOR version
+            )
+      return (decodeLedgerState result)
 
     CardanoMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
@@ -523,12 +531,16 @@ queryDelegationsAndRewardsFromLocalState stakeaddrs
 
     ShelleyMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
-      fmap (uncurry toDelegsAndRwds) $
+      DegenQueryResult result <-
         firstExceptT AcquireFailureError . newExceptT $
           queryNodeLocalState
             connectInfo
-            (getTipPoint tip, GetFilteredDelegationsAndRewardAccounts
-                                (toShelleyStakeCredentials stakeaddrs))
+            ( getTipPoint tip
+            , DegenQuery $
+                GetFilteredDelegationsAndRewardAccounts
+                  (toShelleyStakeCredentials stakeaddrs)
+            )
+      return (uncurry toDelegsAndRwds result)
 
     CardanoMode{} -> do
       tip <- liftIO $ getLocalTip connectInfo
diff --git a/cardano-config/src/Cardano/Config/LedgerQueries.hs b/cardano-config/src/Cardano/Config/LedgerQueries.hs
index 0523d89be8a..bac77300e12 100644
--- a/cardano-config/src/Cardano/Config/LedgerQueries.hs
+++ b/cardano-config/src/Cardano/Config/LedgerQueries.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
 
@@ -10,6 +11,9 @@ import           Prelude (Int, error, (.))
 import qualified Data.Map.Strict as Map
 
 import           Ouroboros.Consensus.Ledger.Abstract
+import           Ouroboros.Consensus.HardFork.Combinator
+import           Ouroboros.Consensus.HardFork.Combinator.Unary
+
 import           Byron.Spec.Ledger.Core (Relation(..))
 
 import qualified Cardano.Chain.Block as Byron
@@ -37,6 +41,10 @@ instance LedgerQueries (Shelley.ShelleyBlock c) where
   ledgerUtxoSize =
     (\(Shelley.UTxO xs)-> Map.size xs) . Shelley._utxo . Shelley._utxoState . Shelley.esLState . Shelley.nesEs . Shelley.shelleyState
 
+instance (LedgerQueries x, NoHardForks x)
+      => LedgerQueries (HardForkBlock '[x]) where
+  ledgerUtxoSize = ledgerUtxoSize . project
+
 instance LedgerQueries (Cardano.CardanoBlock c) where
   ledgerUtxoSize = \case
     Cardano.LedgerStateByron   ledgerByron   -> ledgerUtxoSize ledgerByron
diff --git a/cardano-config/src/Cardano/Config/Types.hs b/cardano-config/src/Cardano/Config/Types.hs
index 8acd1aeb4e8..1747e2b6ed1 100644
--- a/cardano-config/src/Cardano/Config/Types.hs
+++ b/cardano-config/src/Cardano/Config/Types.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DeriveAnyClass #-}
@@ -63,6 +64,9 @@ import           Ouroboros.Consensus.Shelley.Ledger.Block (ShelleyBlock)
 import           Ouroboros.Consensus.Shelley.Ledger.Mempool (GenTx, TxId)
 import           Ouroboros.Consensus.Shelley.Protocol.Crypto.HotKey (HotKey (..))
 
+import           Ouroboros.Consensus.HardFork.Combinator
+import           Ouroboros.Consensus.HardFork.Combinator.Unary
+
 import           Ouroboros.Network.Block (HeaderHash)
 
 import           Cardano.Config.LedgerQueries
@@ -264,6 +268,12 @@ instance HasKESMetricsData ByronBlock where
 
 instance HasKESMetricsData (SimpleBlock a b) where
 
+instance (HasKESMetricsData x, NoHardForks x)
+      => HasKESMetricsData (HardForkBlock '[x]) where
+  getKESMetricsData forgeState =
+    getKESMetricsData (project forgeState)
+
+
 newtype MaxConcurrencyBulkSync = MaxConcurrencyBulkSync
   { unMaxConcurrencyBulkSync :: Word }
   deriving stock (Eq, Ord)
diff --git a/cardano-config/src/Cardano/TracingOrphanInstances/HardFork.hs b/cardano-config/src/Cardano/TracingOrphanInstances/HardFork.hs
index 24cc83af60f..063276abb72 100644
--- a/cardano-config/src/Cardano/TracingOrphanInstances/HardFork.hs
+++ b/cardano-config/src/Cardano/TracingOrphanInstances/HardFork.hs
@@ -46,7 +46,8 @@ import           Ouroboros.Consensus.HardFork.Combinator.AcrossEras
 import           Ouroboros.Consensus.HardFork.History.EraParams
                    (EraParams(..), SafeZone, SafeBeforeEpoch)
 import           Ouroboros.Consensus.TypeFamilyWrappers
-
+import           Ouroboros.Consensus.HardFork.Combinator.Condense ()
+import           Ouroboros.Consensus.Cardano.Condense ()
 import           Ouroboros.Consensus.Util.Condense (Condense(..))
 
 
@@ -92,18 +93,6 @@ instance ToJSON (TxId (GenTx blk)) => ToJSON (WrapGenTxId blk) where
     toJSON = toJSON . unwrapGenTxId
 
 
---
--- instances for GenTx HardForkBlock
---
-
-{-
-instance HasKESMetricsData (HardForkBlock xs) where
-    getKESMetricsData :: ProtocolInfo m (HardForkBlock xs)
-                      -> ForgeState (HardForkBlock xs)
-                      -> KESMetricsData
-    getKESMetricsData protoInfo forgeState =
--}
-
 --
 -- instances for HardForkApplyTxErr
 --
diff --git a/cardano-node/src/Cardano/Node/Protocol/Byron.hs b/cardano-node/src/Cardano/Node/Protocol/Byron.hs
index 7e5c2a91057..69488cf549c 100644
--- a/cardano-node/src/Cardano/Node/Protocol/Byron.hs
+++ b/cardano-node/src/Cardano/Node/Protocol/Byron.hs
@@ -36,13 +36,14 @@ import           Cardano.Crypto.ProtocolMagic (RequiresNetworkMagic)
 
 import           Ouroboros.Consensus.Cardano hiding (Protocol)
 import qualified Ouroboros.Consensus.Cardano as Consensus
-
-import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
+import           Ouroboros.Consensus.Cardano.ByronHFC
 
 import           Cardano.Node.Types (NodeByronProtocolConfiguration (..))
 import           Cardano.Config.Types
                    (ProtocolFilepaths(..), GenesisFile (..))
+
 import           Cardano.TracingOrphanInstances.Byron ()
+import           Cardano.TracingOrphanInstances.HardFork ()
 
 import           Cardano.Node.Protocol.Types
 
@@ -78,7 +79,7 @@ mkConsensusProtocolByron
   :: NodeByronProtocolConfiguration
   -> Maybe ProtocolFilepaths
   -> ExceptT ByronProtocolInstantiationError IO
-             (Consensus.Protocol IO ByronBlock ProtocolRealPBFT)
+             (Consensus.Protocol IO ByronBlockHFC ProtocolByron)
 mkConsensusProtocolByron NodeByronProtocolConfiguration {
                            npcByronGenesisFile,
                            npcByronReqNetworkMagic,
@@ -95,7 +96,7 @@ mkConsensusProtocolByron NodeByronProtocolConfiguration {
     optionalLeaderCredentials <- readLeaderCredentials genesisConfig files
 
     return $
-      Consensus.ProtocolRealPBFT
+      Consensus.ProtocolByron
         genesisConfig
         (PBftSignatureThreshold <$> npcByronPbftSignatureThresh)
         (Update.ProtocolVersion npcByronSupportedProtocolVersionMajor
diff --git a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs
index df30de5ab47..dc1ee1c0ed0 100644
--- a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs
+++ b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs
@@ -50,7 +50,6 @@ import           Cardano.Config.Types
 
 import           Cardano.TracingOrphanInstances.Byron ()
 import           Cardano.TracingOrphanInstances.Shelley ()
-import           Cardano.TracingOrphanInstances.HardFork ()
 
 import qualified Cardano.Node.Protocol.Byron as Byron
 import qualified Cardano.Node.Protocol.Shelley as Shelley
diff --git a/cardano-node/src/Cardano/Node/Protocol/Shelley.hs b/cardano-node/src/Cardano/Node/Protocol/Shelley.hs
index bea8f96f720..0dbef483248 100644
--- a/cardano-node/src/Cardano/Node/Protocol/Shelley.hs
+++ b/cardano-node/src/Cardano/Node/Protocol/Shelley.hs
@@ -34,8 +34,8 @@ import           Control.Monad.Trans.Except.Extra
 import qualified Cardano.Crypto.Hash.Class as Crypto
 
 import qualified Ouroboros.Consensus.Cardano as Consensus
+import           Ouroboros.Consensus.Cardano.ShelleyHFC
 
-import           Ouroboros.Consensus.Shelley.Ledger
 import           Ouroboros.Consensus.Shelley.Protocol
                    (TPraosStandardCrypto, TPraosIsCoreNode(..))
 import           Ouroboros.Consensus.Shelley.Node
@@ -50,7 +50,9 @@ import qualified Cardano.Api.Typed as Api (FileError)
 import           Cardano.Node.Types (NodeShelleyProtocolConfiguration(..))
 import           Cardano.Config.Types
                    (ProtocolFilepaths(..), GenesisFile (..))
+
 import           Cardano.TracingOrphanInstances.Shelley ()
+import           Cardano.TracingOrphanInstances.HardFork ()
 
 import           Cardano.Node.Protocol.Types
 
@@ -86,8 +88,8 @@ mkConsensusProtocolShelley
   :: NodeShelleyProtocolConfiguration
   -> Maybe ProtocolFilepaths
   -> ExceptT ShelleyProtocolInstantiationError IO
-             (Consensus.Protocol IO (ShelleyBlock TPraosStandardCrypto)
-                                 Consensus.ProtocolRealTPraos)
+             (Consensus.Protocol IO (ShelleyBlockHFC TPraosStandardCrypto)
+                                 Consensus.ProtocolShelley)
 mkConsensusProtocolShelley NodeShelleyProtocolConfiguration {
                             npcShelleyGenesisFile,
                             npcShelleySupportedProtocolVersionMajor,
@@ -99,7 +101,7 @@ mkConsensusProtocolShelley NodeShelleyProtocolConfiguration {
     optionalLeaderCredentials <- readLeaderCredentials files
 
     return $
-      Consensus.ProtocolRealTPraos
+      Consensus.ProtocolShelley
         genesis
         (Nonce (Crypto.castHash genesisHash))
         (ProtVer npcShelleySupportedProtocolVersionMajor
diff --git a/stack.yaml b/stack.yaml
index 867439ec289..919c57fde5f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -122,7 +122,7 @@ extra-deps:
     #Ouroboros-network dependencies
 
   - git: https://github.com/input-output-hk/ouroboros-network
-    commit: dae680f8e6b0af611c323554c375f50b3bfd5308
+    commit: 46e8fd88b0ba071f38891b2b9c6682dc2fb8c865
     subdirs:
         - io-sim
         - io-sim-classes