diff --git a/api/.env.sample b/api/.env.sample
index 430f663f7..43dccbd00 100644
--- a/api/.env.sample
+++ b/api/.env.sample
@@ -3,7 +3,7 @@ SERVER_PORT=31200
 CORS_ALLOW_ORIGIN=
 SECRET_KEY="secret key for encrypting datasource passwords"
 ENABLE_AUTH=0
-ENABLE_SQL_PARSER=0
+ENABLE_QUERY_PARSER=0
 SUPER_ADMIN_PASSWORD=
 DATABASE_CONNECTION_TIMEOUT_MS=
 DATABASE_POOL_SIZE=
diff --git a/api/README.md b/api/README.md
index 8afb8a390..5ff8a5f3e 100644
--- a/api/README.md
+++ b/api/README.md
@@ -11,7 +11,7 @@ Add a `.env` file based on `.env.sample`
 - `CORS_ALLOW_ORIGIN` for configuring cors. separate multiple origins by `;`. Defaults to `http://localhost`
 - `SECRET_KEY` for encrypting and decrypting passwords used in datasource configurations
 - `ENABLE_AUTH` Whether to add authentication and authorization to routes. 0 = disabled, 1 = enabled
-- `ENABLE_SQL_PARSER` Whether to enable Server-Side SQL parsing. 0 = disabled, 1 = enabled
+- `ENABLE_QUERY_PARSER` Whether to enable Server-Side Query parsing. 0 = disabled, 1 = enabled
 - `SUPER_ADMIN_PASSWORD` The password which will be configured for the superadmin account during migration. Must be configured before migration is run. If value is not set, password will be 'secret'
 - `DATABASE_CONNECTION_TIMEOUT_MS` for configuration the time after which the db connection will timeout in milliseconds. Default is 30000ms (30 seconds)
 - `DATABASE_POOL_SIZE` for configuration the maximum number of clients in the pool
diff --git a/api/src/utils/constants.ts b/api/src/utils/constants.ts
index cdc0369e9..dc2e6b20d 100644
--- a/api/src/utils/constants.ts
+++ b/api/src/utils/constants.ts
@@ -6,4 +6,4 @@ export const DATABASE_CONNECTION_TIMEOUT_MS = parseInt(process.env.DATABASE_CONN
 export const DATABASE_POOL_SIZE = parseInt(process.env.DATABASE_POOL_SIZE ?? '10');
 export const DEFAULT_LANGUAGE = 'en';
 export const FS_CACHE_RETAIN_TIME = '86400';
-export const QUERY_PARSING_ENABLED = process.env.ENABLE_SQL_PARSER === '1';
+export const QUERY_PARSING_ENABLED = process.env.ENABLE_QUERY_PARSER === '1';
diff --git a/api/tests/e2e/jest.setup.ts b/api/tests/e2e/jest.setup.ts
index 5227be8c2..d89bdbdc7 100644
--- a/api/tests/e2e/jest.setup.ts
+++ b/api/tests/e2e/jest.setup.ts
@@ -8,7 +8,7 @@ module.exports = async (globalConfig) => {
   process.env.WEBSITE_LOGO_URL_EN = 'WEBSITE_LOGO_URL_EN';
   process.env.WEBSITE_LOGO_JUMP_URL = '/WEBSITE_LOGO_JUMP_URL';
   process.env.WEBSITE_FAVICON_URL = '/WEBSITE_FAVICON_URL';
-  process.env.ENABLE_SQL_PARSER = '1';
+  process.env.ENABLE_QUERY_PARSER = '1';
 
   dashboardDataSource.setOptions({ url: process.env.END_2_END_TEST_PG_URL! });
 
diff --git a/api/tests/integration/jest.setup.ts b/api/tests/integration/jest.setup.ts
index 3b5486d81..c4ca8b4f2 100644
--- a/api/tests/integration/jest.setup.ts
+++ b/api/tests/integration/jest.setup.ts
@@ -8,7 +8,7 @@ module.exports = async (globalConfig) => {
   process.env.WEBSITE_LOGO_URL_EN = 'WEBSITE_LOGO_URL_EN';
   process.env.WEBSITE_LOGO_JUMP_URL = '/WEBSITE_LOGO_JUMP_URL';
   process.env.WEBSITE_FAVICON_URL = '/WEBSITE_FAVICON_URL';
-  process.env.ENABLE_SQL_PARSER = '1';
+  process.env.ENABLE_QUERY_PARSER = '1';
 
   dashboardDataSource.setOptions({ url: process.env.INTEGRATION_TEST_PG_URL! });