diff --git a/e2e/e2e.md b/e2e/e2e.md
index f1e8560..32bfc76 100644
--- a/e2e/e2e.md
+++ b/e2e/e2e.md
@@ -7,6 +7,7 @@
 - To run the test you'll need two OpenWhisk namespaces. Please set the credentials for those in the following env
   variables in an .env file:
   - `TEST_NAMESPACE_1, TEST_AUTH_1, TEST_NAMESPACE_2, TEST_AUTH_2`
+  - Make sure to use namespaces that are prefixed with `development-*` for non-prod environments
 
 Copy the `.env.example` to your own `.env` in this folder.
 
diff --git a/lib/constants.js b/lib/constants.js
index c01a387..1578ede 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -19,9 +19,13 @@ const { isInternalToAdobeRuntime } = require('./utils')
 // (see ADOBE_STATE_STORE_REGIONS first element default)
 const {
   ADOBE_STATE_STORE_ENDPOINT_PROD = 'storage-state-amer.app-builder.adp.adobe.io',
-  ADOBE_STATE_STORE_ENDPOINT_STAGE = 'storage-state-amer.stg.app-builder.corp.adp.adobe.io',
   ADOBE_STATE_STORE_ENDPOINT_PROD_INTERNAL = 'storage-state-amer.app-builder.int.adp.adobe.io',
-  ADOBE_STATE_STORE_ENDPOINT_STAGE_INTERNAL = 'storage-state-amer.stg.app-builder.int.adp.adobe.io',
+
+  // we always use the stage public endpoint, as Runtime Prod doesn't have access to State Stage internal
+  // see https://jira.corp.adobe.com/browse/ACNA-2699
+  ADOBE_STATE_STORE_ENDPOINT_STAGE = 'storage-state-amer.stg.app-builder.adp.adobe.io',
+  ADOBE_STATE_STORE_ENDPOINT_STAGE_INTERNAL = 'storage-state-amer.stg.app-builder.adp.adobe.io',
+
   API_VERSION = 'v1beta1',
   ADOBE_STATE_STORE_REGIONS = [ // first region is the default region
     'amer',