diff --git a/.github/workflows/contracts-docs.yml b/.github/workflows/contracts-docs.yml
index 4f88ab6ae..394d7afe9 100644
--- a/.github/workflows/contracts-docs.yml
+++ b/.github/workflows/contracts-docs.yml
@@ -39,7 +39,7 @@ jobs:
       github.event_name == 'pull_request'
         || github.event_name == 'push'
         || github.event_name == 'workflow_dispatch'
-    uses: keep-network/ci/.github/workflows/reusable-solidity-docs.yml@fix-docs-generation # TODO: change to `main`
+    uses: keep-network/ci/.github/workflows/reusable-solidity-docs.yml@main
     with:
       projectDir: /solidity
       # We need to remove unnecessary `//` comment used in the `@dev`
@@ -62,9 +62,8 @@ jobs:
   contracts-docs-publish:
     name: Publish contracts documentation
     needs: docs-detect-changes
-    # TODO: remove last OR
-    if: (github.event_name == 'release' && startsWith(github.ref, 'refs/tags/solidity/')) || github.ref == 'refs/pull/584/merge'
-    uses: keep-network/ci/.github/workflows/reusable-solidity-docs.yml@fix-docs-generation # TODO: change to `main`
+    if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/solidity/')
+    uses: keep-network/ci/.github/workflows/reusable-solidity-docs.yml@main
     with:
       projectDir: /solidity
       # We need to remove unnecessary `//` comment used in the `@dev`