diff --git a/openapi.yaml b/openapi.yaml
index fdb8b314..3500278c 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -7,8 +7,15 @@ info:
     name: MIT
     url: https://github.com/hashgraph/hedera-sourcify/blob/master/LICENSE
 servers:
-  - url: http://localhost:5002
-    description: Local development server address on default port 5002.
+  - description: The current REST API server
+    url: ""
+  - description: The production REST API server
+    url: "https://server-verify.hashscan.io"
+  - description: Local development server address on default port 5002
+    url: "http://localhost:5002"
+tags:
+  - name: Session Verification
+    description: Endpoints behind CORS validation. Unable to use them from outside the deployed domain e.g `example.io`.
 paths:
   /session/data:
     $ref: "src/server/controllers/verification/session-state/data.session-state.paths.yaml#/paths/~1session~1data"
@@ -18,24 +25,24 @@ paths:
     $ref: "src/server/controllers/verification/session-state/input-files.session-state.paths.yaml#/paths/~1session~1input-files"
   /session/input-contract:
     $ref: "src/server/controllers/verification/session-state/input-contract.session-state.paths.yaml#/paths/~1session~1input-contract"
-  /verify:
-    $ref: "src/server/controllers/verification/verify/stateless/verify.stateless.paths.yaml#/paths/~1verify"
   /session/verify-checked:
     $ref: "src/server/controllers/verification/verify/session/verify.session.paths.yaml#/paths/~1session~1verify-checked"
-  /verify/solc-json:
-    $ref: "src/server/controllers/verification/solc-json/stateless/solc-json.stateless.paths.yaml#/paths/~1verify~1solc-json"
   /session/input-solc-json:
     $ref: "src/server/controllers/verification/solc-json/session/solc-json.session.paths.yaml#/paths/~1session~1input-solc-json"
-  /verify/create2:
-    $ref: "src/server/controllers/verification/create2/stateless/create2.stateless.paths.yaml#/paths/~1verify~1create2"
   /session/verify/create2:
     $ref: "src/server/controllers/verification/create2/session/create2.session.paths.yaml#/paths/~1session~1verify~1create2"
   /session/verify/create2/compile:
     $ref: "src/server/controllers/verification/create2/session/compile.create2.session.paths.yaml#/paths/~1session~1verify~1create2~1compile"
-  /verify/etherscan:
-    $ref: "src/server/controllers/verification/etherscan/stateless/etherscan.stateless.paths.yaml#/paths/~1verify~1etherscan"
   /session/verify/etherscan:
     $ref: "src/server/controllers/verification/etherscan/session/etherscan.session.paths.yaml#/paths/~1session~1verify~1etherscan"
+  /verify:
+    $ref: "src/server/controllers/verification/verify/stateless/verify.stateless.paths.yaml#/paths/~1verify"
+  /verify/solc-json:
+    $ref: "src/server/controllers/verification/solc-json/stateless/solc-json.stateless.paths.yaml#/paths/~1verify~1solc-json"
+  /verify/create2:
+    $ref: "src/server/controllers/verification/create2/stateless/create2.stateless.paths.yaml#/paths/~1verify~1create2"
+  /verify/etherscan:
+    $ref: "src/server/controllers/verification/etherscan/stateless/etherscan.stateless.paths.yaml#/paths/~1verify~1etherscan"
   /check-all-by-addresses:
     $ref: "src/server/controllers/repository/check-all-by-addresses.stateless.paths.yaml#/paths/~1check-all-by-addresses"
   /check-by-addresses: