diff --git a/.github/workflows/hls.yml b/.github/workflows/hls.yml
index 2cb7b4e702..8a7b91ed95 100644
--- a/.github/workflows/hls.yml
+++ b/.github/workflows/hls.yml
@@ -119,6 +119,4 @@ jobs:
           cradle:
             cabal:
           EOF
-          # Remove the following line after `cardano-rpc` project is enabled in `cabal.project`
-          mv cardano-rpc ../
           haskell-language-server
diff --git a/cabal.project b/cabal.project
index 09bca7b9f3..b46c928bd0 100644
--- a/cabal.project
+++ b/cabal.project
@@ -13,17 +13,14 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2025-09-11T01:58:40Z
-  , cardano-haskell-packages 2025-10-21T11:16:53Z
+  , hackage.haskell.org 2025-10-24T09:48:28Z
+  , cardano-haskell-packages 2025-10-24T13:50:12Z
 
 packages:
     cardano-api
     cardano-api-gen
     cardano-wasm
-    -- TODO fix potential issues with build-type: Custom and protoc and reenable
-    -- When uncommenting this line, remember to reenable in .github/workflows/hls.yml
-    -- by removing the line that moves it away before calling `haskell-language-server`.
-    -- cardano-rpc
+    cardano-rpc
 
 extra-packages: Cabal, process
 
@@ -169,4 +166,4 @@ if arch(wasm32)
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
--- temporary! Please read the section in CONTRIBUTING about updating dependencies.
\ No newline at end of file
+-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
diff --git a/flake.lock b/flake.lock
index e3333b5f10..152d079ee1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "CHaP": {
       "flake": false,
       "locked": {
-        "lastModified": 1761046751,
-        "narHash": "sha256-hY/Ji19rqVF6PbzNzNuyqnSH91LhUb43W3FD3ZCFzsI=",
+        "lastModified": 1761709320,
+        "narHash": "sha256-YgrC0Mi/Iqk6jJrnw0ZPYpQtqTpIUz2tOCHGaSx1uEI=",
         "owner": "intersectmbo",
         "repo": "cardano-haskell-packages",
-        "rev": "bfb2e57b8cdf6e15740fe3c4f254d91996f5c3ee",
+        "rev": "5190ad5239f4daed10b9d30d56961ae9cdb8f1e8",
         "type": "github"
       },
       "original": {
@@ -244,11 +244,11 @@
     "hackageNix": {
       "flake": false,
       "locked": {
-        "lastModified": 1757556832,
-        "narHash": "sha256-wYDrrdoMjh0Zgmshm5YpM3b/n3U5I9cCw1790g9gKPM=",
+        "lastModified": 1761708648,
+        "narHash": "sha256-cVBWmAS6MFJPCToNO/CSTCoZ01jIYuodt0HfE1Wuox8=",
         "owner": "input-output-hk",
         "repo": "hackage.nix",
-        "rev": "42d89c223129ae35497ed4b4f3882071ccf8bef7",
+        "rev": "80a7eb3db6236f82dff512d8213e0a52c3d9c8f6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bcadb53131..5caa6c18fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -172,11 +172,10 @@
                 substituteInPlace crypton-x509-system.cabal --replace 'Crypt32' 'crypt32'
               '';
             }
-            # TODO uncomment when reenabling cardano-rpc
-            # ({pkgs, ...}: {
-            #   packages.proto-lens-protobuf-types.components.library.build-tools = [pkgs.buildPackages.protobuf];
-            #   packages.cardano-rpc.components.library.build-tools = [pkgs.buildPackages.protobuf];
-            # })
+            ({pkgs, ...}: {
+              packages.proto-lens-protobuf-types.components.library.build-tools = [pkgs.buildPackages.protobuf];
+              packages.cardano-rpc.components.library.build-tools = [pkgs.buildPackages.protobuf];
+            })
           ];
         });
         # ... and construct a flake from the cabal project