diff --git a/horizon.dhall b/horizon.dhall
index fbdaef2cfa877e01b24dd9c32712bd004c463333..41901490e6f0a4a78f1f74825e1e39e87f561996 100644
--- a/horizon.dhall
+++ b/horizon.dhall
@@ -184,9 +184,9 @@ let otherLibraries =
               "7497a29cb998721a9068d5725d49461f2bba0e7a"
               (None H.Subdir)
         , ouroboros-network-api = callOuroborosNetwork "ouroboros-network-api"
-        , ouroboros-network-framework = callCHaP "ouroboros-network-framework" "0.2.0.0"
+        , ouroboros-network-framework = callOuroborosNetwork "ouroboros-network-framework"
         , ouroboros-network-mock = callOuroborosNetwork "ouroboros-network-mock"
-        , ouroboros-network-testing = callCHaP "ouroboros-network-testing" "0.2.0.0"
+        , ouroboros-network-testing = callOuroborosNetwork "ouroboros-network-testing"
         , prettyprinter-configurable =
             H.callGit
               "https://github.com/milloni/plutus"
diff --git a/pkgs/ouroboros-network-framework.nix b/pkgs/ouroboros-network-framework.nix
index 84170d68359bb43fd034565d416eb2834a3b2220..c32b1c50622816afc20937070593c309c77396d8 100644
--- a/pkgs/ouroboros-network-framework.nix
+++ b/pkgs/ouroboros-network-framework.nix
@@ -10,7 +10,7 @@
 , contra-tracer
 , directory
 , dns
-, fetchzip
+, fetchgit
 , hashable
 , io-classes
 , io-sim
@@ -22,6 +22,7 @@
 , network-mux
 , nothunks
 , optparse-applicative
+, ouroboros-network-api
 , ouroboros-network-testing
 , pretty-simple
 , quickcheck-instances
@@ -33,7 +34,6 @@
 , tasty
 , tasty-quickcheck
 , text
-, these
 , time
 , typed-protocols
 , typed-protocols-cborg
@@ -42,10 +42,13 @@
 mkDerivation {
   pname = "ouroboros-network-framework";
   version = "0.2.0.0";
-  src = fetchzip {
-    url = "https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-network-framework-0.2.0.0.tar.gz";
-    sha256 = "0m4n9wqscfc6js15hklv0jq37ig3n9h6zrd0s5d326i41agdz7ra";
+  src = fetchgit {
+    url = "https://github.com/input-output-hk/ouroboros-network";
+    sha256 = "0nr5qkphcc5hp1az6fw934zxi0yw9k5626ys1yyw6ybbw38xwpik";
+    rev = "c65353299ff3efde05bf07d628a2ac7ea3193458";
+    fetchSubmodules = true;
   };
+  postUnpack = "sourceRoot+=/ouroboros-network-framework/; echo source root reset to $sourceRoot";
   isLibrary = true;
   isExecutable = true;
   enableSeparateDataOutput = false;
@@ -67,6 +70,7 @@ mkDerivation {
     network
     network-mux
     nothunks
+    ouroboros-network-api
     ouroboros-network-testing
     QuickCheck
     quiet
@@ -74,7 +78,6 @@ mkDerivation {
     stm
     strict-stm
     text
-    time
     typed-protocols
     typed-protocols-cborg
     Win32-network
@@ -83,15 +86,14 @@ mkDerivation {
     async
     base
     bytestring
-    cborg
     contra-tracer
     directory
     io-classes
     network
     network-mux
     optparse-applicative
+    ouroboros-network-api
     random
-    serialise
     strict-stm
     typed-protocols
     typed-protocols-examples
@@ -99,7 +101,6 @@ mkDerivation {
   testHaskellDepends = [
     base
     bytestring
-    cardano-prelude
     cborg
     containers
     contra-tracer
@@ -111,6 +112,7 @@ mkDerivation {
     monoidal-synchronisation
     network
     network-mux
+    ouroboros-network-api
     ouroboros-network-testing
     pretty-simple
     QuickCheck
@@ -121,7 +123,6 @@ mkDerivation {
     tasty
     tasty-quickcheck
     text
-    these
     time
     typed-protocols
     typed-protocols-cborg
diff --git a/pkgs/ouroboros-network-testing.nix b/pkgs/ouroboros-network-testing.nix
index 4b8551041d4bd49e447b20dce98e2232d76fc113..d414b3b409700d9d363d39593b4bbacfdb4300e6 100644
--- a/pkgs/ouroboros-network-testing.nix
+++ b/pkgs/ouroboros-network-testing.nix
@@ -5,7 +5,7 @@
 , containers
 , contra-tracer
 , deque
-, fetchzip
+, fetchgit
 , io-classes
 , io-sim
 , lib
@@ -19,10 +19,13 @@
 mkDerivation {
   pname = "ouroboros-network-testing";
   version = "0.2.0.0";
-  src = fetchzip {
-    url = "https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-network-testing-0.2.0.0.tar.gz";
-    sha256 = "1cdmzrl1bx4rdyfb273m9lblzbbn9hzppzayq5yn2q4g30adjf7b";
+  src = fetchgit {
+    url = "https://github.com/input-output-hk/ouroboros-network";
+    sha256 = "0nr5qkphcc5hp1az6fw934zxi0yw9k5626ys1yyw6ybbw38xwpik";
+    rev = "c65353299ff3efde05bf07d628a2ac7ea3193458";
+    fetchSubmodules = true;
   };
+  postUnpack = "sourceRoot+=/ouroboros-network-testing/; echo source root reset to $sourceRoot";
   isLibrary = true;
   isExecutable = false;
   enableSeparateDataOutput = false;