diff --git a/pages/api/metadata/[...params].js b/pages/api/metadata/[...params].js
index f9e4816f09..92ce9c4962 100644
--- a/pages/api/metadata/[...params].js
+++ b/pages/api/metadata/[...params].js
@@ -1,7 +1,7 @@
 import { GFW_METADATA_API, GFW_STAGING_METADATA_API } from 'utils/apis';
 import axios from 'axios';
 
-const ENVIRONMENT = process.env.NEXT_PUBLIC_FEATURE_ENV;
+const ENVIRONMENT = process.env.NEXT_PUBLIC_RW_FEATURE_ENV;
 const GFW_METADATA_API_URL =
   ENVIRONMENT === 'staging' ? GFW_STAGING_METADATA_API : GFW_METADATA_API;
 
diff --git a/providers/datasets-provider/actions.js b/providers/datasets-provider/actions.js
index 18fa932203..cb0784831b 100644
--- a/providers/datasets-provider/actions.js
+++ b/providers/datasets-provider/actions.js
@@ -14,7 +14,7 @@ export const setDatasets = createAction('setDatasets');
 export const setDatasetsWithMetadata = createAction('setDatasetsWithMetadata');
 
 const handleFeatureEnvLock = (env) => {
-  const currEnv = process.env.NEXT_PUBLIC_FEATURE_ENV;
+  const currEnv = process.env.NEXT_PUBLIC_RW_FEATURE_ENV;
   const MIXED_ENV = 'preproduction-staging';
   if (env === MIXED_ENV && currEnv !== 'production') {
     return true;
diff --git a/services/datasets.js b/services/datasets.js
index 4d1b819d71..a7ff3012f6 100644
--- a/services/datasets.js
+++ b/services/datasets.js
@@ -1,7 +1,7 @@
 import { rwRequest, dataRequest } from 'utils/request';
 
 const environmentString = () => {
-  const env = process.env.NEXT_PUBLIC_FEATURE_ENV;
+  const env = process.env.NEXT_PUBLIC_RW_FEATURE_ENV;
   let envString = 'production';
   if (env === 'preproduction') {
     envString += ',preproduction';
diff --git a/services/shape.js b/services/shape.js
index 003208f9c7..d859860ac8 100644
--- a/services/shape.js
+++ b/services/shape.js
@@ -3,7 +3,9 @@ import request from 'utils/request';
 import { GFW_API, GFW_STAGING_API } from 'utils/apis';
 
 const GFW_API_URL =
-  process.env.NEXT_PUBLIC_FEATURE_ENV === 'staging' ? GFW_STAGING_API : GFW_API;
+  process.env.NEXT_PUBLIC_RW_FEATURE_ENV === 'staging'
+    ? GFW_STAGING_API
+    : GFW_API;
 
 const QUERIES = {
   ogrConvert: '/v2/ogr/convert',