diff --git a/README.md b/README.md
index 997f116..239a02b 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,8 @@ similar mechanism in Kubernetes or your actual platform.
 | BEACH_APPLICATION_CUSTOM_STARTUP_SCRIPTS_ENABLE | boolean | true                      | If custom startup scripts (beach-startup.sh) should be run                           |
 | BEACH_FLOW_BASE_CONTEXT                         | string  | Production                | Base context, either "Development" or "Production"                                   |
 | BEACH_FLOW_SUB_CONTEXT                          | string  | Instance                  | Sub context                                                                          |
-| BEACH_FLOW_CONTEXT                              | string  | Production/Beach/Instance | (read-only) The actual Flow context; pattern: "{…BASE_CONTEXT}/Beach/{…SUB_CONTEXT}" |
+| BEACH_FLOW_CONTEXT                              | string  | Production/Beach/Instance | (read-only) The built Flow context; pattern: "{…BASE_CONTEXT}/Beach/{…SUB_CONTEXT}"  |
+| FLOW_CONTEXT                                    | string  |                           | The actual Flow context; default is BEACH_FLOW_CONTEXT                               |
 | BEACH_ENVIRONMENT_VARIABLES_ALLOW_LIST          | string  |                           | If set, only these environment variables are promoted to the "beach" user's shell    |
 | BEACH_CRON_ENABLE                               | boolean | false                     | If user-defined cron-jobs (beach-cron-hourly.sh) should be enabled                   |
 
diff --git a/root-files/opt/flownative/lib/beach.sh b/root-files/opt/flownative/lib/beach.sh
index 38156e0..bb4b4cb 100755
--- a/root-files/opt/flownative/lib/beach.sh
+++ b/root-files/opt/flownative/lib/beach.sh
@@ -32,13 +32,13 @@ export BEACH_INSTANCE_NAME=${BEACH_INSTANCE_NAME:-}
 export BEACH_PROJECT_NAME=${BEACH_PROJECT_NAME:-}
 
 export BEACH_FLOW_BASE_CONTEXT=${BEACH_FLOW_BASE_CONTEXT:-Production}
-export BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-}
-if [ -z ${BEACH_FLOW_SUB_CONTEXT} ]; then
-    export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/Instance
+export BEACH_FLOW_SUB_CONTEXT=${BEACH_FLOW_SUB_CONTEXT:-Instance}
+export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/${BEACH_FLOW_SUB_CONTEXT}
+if [[ -v FLOW_CONTEXT ]]; then
+    export FLOW_CONTEXT
 else
-    export BEACH_FLOW_CONTEXT=${BEACH_FLOW_BASE_CONTEXT}/Beach/${BEACH_FLOW_SUB_CONTEXT}
+    export FLOW_CONTEXT=${BEACH_FLOW_CONTEXT}
 fi
-export FLOW_CONTEXT=${BEACH_FLOW_CONTEXT}
 
 export BEACH_DATABASE_HOST=${BEACH_DATABASE_HOST:-}
 export BEACH_DATABASE_SOCKET=${BEACH_DATABASE_SOCKET:-}