diff --git a/.gitmodules b/.gitmodules
index 5739e93dcd..3613537004 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,6 @@
 [submodule "hugo-theme-learn"]
 	path = docs/themes/learn
 	url = https://github.com/matcornic/hugo-theme-learn.git
-[submodule "modules/wai-routes"]
-	path = server/modules/wai-routes
-	url = https://github.com/CardanoSolutions/wai-routes.git
-[submodule "modules/hjsonpointer"]
-	path = server/modules/hjsonpointer
-	url = https://github.com/CardanoSolutions/hjsonpointer.git
-[submodule "modules/hjsonschema"]
-	path = server/modules/hjsonschema
-	url = https://github.com/CardanoSolutions/hjsonschema.git
 [submodule "server/config"]
 	path = server/config
 	url = https://github.com/cardano-foundation/cardano-configurations.git
diff --git a/server/cabal.project b/server/cabal.project
index c0115064ea..473bde0790 100644
--- a/server/cabal.project
+++ b/server/cabal.project
@@ -38,8 +38,6 @@ packages:
   modules/contra-tracers
   modules/fast-bech32
   modules/git-th
-  modules/hjsonpointer
-  modules/hjsonschema
   modules/hspec-json-schema
   modules/json-rpc
 
@@ -87,6 +85,16 @@ package text
 package formatting
   flags: +no-double-conversion
 
+source-repository-package
+  type: git
+  location: https://github.com/CardanoSolutions/hjsonpointer.git
+  tag: 879f0e74d55eef76ceaec8f60ed07657ab84bad7
+
+source-repository-package
+  type: git
+  location: https://github.com/CardanoSolutions/hjsonschema.git
+  tag: fc9cfe92723e305e6289e7c1733f3420d64dd9d5
+
 -- cardano-ledger with queryDRepDelegations backported on top of conway-1.19.0.0 (instead of 1.20.0.0).
 source-repository-package
   type: git
diff --git a/server/modules/hjsonpointer b/server/modules/hjsonpointer
deleted file mode 160000
index 879f0e74d5..0000000000
--- a/server/modules/hjsonpointer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 879f0e74d55eef76ceaec8f60ed07657ab84bad7
diff --git a/server/modules/hjsonschema b/server/modules/hjsonschema
deleted file mode 160000
index fc9cfe9272..0000000000
--- a/server/modules/hjsonschema
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc9cfe92723e305e6289e7c1733f3420d64dd9d5
diff --git a/server/modules/wai-routes b/server/modules/wai-routes
deleted file mode 160000
index d74b396837..0000000000
--- a/server/modules/wai-routes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d74b39683792649c01113f40bf57724dcf95c96a
diff --git a/server/src/Ogmios/App/Server/Http.hs b/server/src/Ogmios/App/Server/Http.hs
index 2a2b9fea05..f5cc2d93a7 100644
--- a/server/src/Ogmios/App/Server/Http.hs
+++ b/server/src/Ogmios/App/Server/Http.hs
@@ -6,9 +6,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
--- NOTE: Needed because of auto-generated template-haskell code for wai-routes.
-{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
-
 module Ogmios.App.Server.Http
     ( mkHttpApp
     , healthCheck
diff --git a/server/test/unit/Ogmios/Data/JsonSpec.hs b/server/test/unit/Ogmios/Data/JsonSpec.hs
index 1d53583367..28167c7c64 100644
--- a/server/test/unit/Ogmios/Data/JsonSpec.hs
+++ b/server/test/unit/Ogmios/Data/JsonSpec.hs
@@ -395,7 +395,7 @@ spec = do
                     fail "successfully decoded an invalid payload (as Conway Utxo)?"
 
         specify "Golden: Script_Native_0.json" $ do
-            json <- decodeFileThrow "Script_native_0.json"
+            json <- decodeFileThrow "Script_Native_0.json"
             case traverse @[] (Json.parse (decodeScript @BabbageEra)) json of
                 Json.Error e ->
                     fail (show e)