diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c0a38a76b7..1c69a5fed399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### 🔩 Tests
 
 - Add functional test cypress workflow improvements and enable the workflow for in-house Dashboards tests ([#6061](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6061))
+- Rename cypress config file to its version supported convention ([#6137](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6137))
 
 ## [2.12.0 - 2024-02-20](https://github.com/opensearch-project/OpenSearch-Dashboards/releases/tag/2.12.0)
 
diff --git a/cypress.config.js b/cypress.config.js
deleted file mode 100644
index 6312b14e8777..000000000000
--- a/cypress.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const { defineConfig } = require('cypress');
-
-module.exports = defineConfig({
-  defaultCommandTimeout: 60000,
-  requestTimeout: 60000,
-  responseTimeout: 60000,
-  baseUrl: 'http://localhost:5601',
-  viewportWidth: 2000,
-  viewportHeight: 1320,
-  env: {
-    openSearchUrl: 'http://localhost:9200',
-    SECURITY_ENABLED: false,
-    AGGREGATION_VIEW: false,
-    username: 'admin',
-    password: 'myStrongPassword123!',
-    ENDPOINT_WITH_PROXY: false,
-    MANAGED_SERVICE_ENDPOINT: false,
-    VISBUILDER_ENABLED: true,
-    DATASOURCE_MANAGEMENT_ENABLED: false,
-    ML_COMMONS_DASHBOARDS_ENABLED: true,
-    WAIT_FOR_LOADER_BUFFER_MS: 0,
-  },
-});
diff --git a/cypress.json b/cypress.json
new file mode 100644
index 000000000000..46e8c7e8ea16
--- /dev/null
+++ b/cypress.json
@@ -0,0 +1,21 @@
+{
+  "defaultCommandTimeout": 60000,
+  "requestTimeout": 60000,
+  "responseTimeout": 60000,
+  "baseUrl": "http://localhost:5601",
+  "viewportWidth": 2000,
+  "viewportHeight": 1320,
+  "env": {
+    "openSearchUrl": "http://localhost:9200",
+    "SECURITY_ENABLED": false,
+    "AGGREGATION_VIEW": false,
+    "username": "admin",
+    "password": "myStrongPassword123!",
+    "ENDPOINT_WITH_PROXY": false,
+    "MANAGED_SERVICE_ENDPOINT": false,
+    "VISBUILDER_ENABLED": true,
+    "DATASOURCE_MANAGEMENT_ENABLED": false,
+    "ML_COMMONS_DASHBOARDS_ENABLED": true,
+    "WAIT_FOR_LOADER_BUFFER_MS": 0
+  }
+}