diff --git a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
index e3769090..3d38dcd4 100644
--- a/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
+++ b/src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
@@ -76,7 +76,15 @@ public class AuthenticationApplication implements Application {
     private AuthenticationApplication() {
         // Start of user code constructor_init
         // End of user code
+        var AUTH_VAR = "OAUTH_STORE_FILE";
+        final Map<String, String> env = System.getenv();
         oslcConsumerStoreFilename= "./oslcOAuthStore.xml";
+        if (env.containsKey(AUTH_VAR)) {
+            oslcConsumerStoreFilename = env.get(AUTH_VAR);
+            log.debug("ENV variable '{}' found", AUTH_VAR);
+        } else {
+            log.debug("ENV variable '{}' not defined", AUTH_VAR);
+        }
         oauth1TokenToApplicationConnector = new LRUCache<String, String>(2000);
         // Start of user code constructor_finalize
         // End of user code
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
index 9926c6e0..3c906018 100644
--- a/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/gen/auth/AuthenticationApplication.java
@@ -76,7 +76,15 @@ public class AuthenticationApplication implements Application {
     private AuthenticationApplication() {
         // Start of user code constructor_init
         // End of user code
+        var AUTH_VAR = "OAUTH_STORE_FILE";
+        final Map<String, String> env = System.getenv();
         oslcConsumerStoreFilename= "./oslcOAuthStore.xml";
+        if (env.containsKey(AUTH_VAR)) {
+            oslcConsumerStoreFilename = env.get(AUTH_VAR);
+            log.debug("ENV variable '{}' found", AUTH_VAR);
+        } else {
+            log.debug("ENV variable '{}' not defined", AUTH_VAR);
+        }
         oauth1TokenToApplicationConnector = new LRUCache<String, String>(2000);
         // Start of user code constructor_finalize
         // End of user code
diff --git a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
index 1fdcf9c9..25c8ad0b 100644
--- a/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
+++ b/src/server-qm/src/main/java/co/oslc/refimpl/qm/gen/auth/AuthenticationApplication.java
@@ -76,7 +76,15 @@ public class AuthenticationApplication implements Application {
     private AuthenticationApplication() {
         // Start of user code constructor_init
         // End of user code
+        var AUTH_VAR = "OAUTH_STORE_FILE";
+        final Map<String, String> env = System.getenv();
         oslcConsumerStoreFilename= "./oslcOAuthStore.xml";
+        if (env.containsKey(AUTH_VAR)) {
+            oslcConsumerStoreFilename = env.get(AUTH_VAR);
+            log.debug("ENV variable '{}' found", AUTH_VAR);
+        } else {
+            log.debug("ENV variable '{}' not defined", AUTH_VAR);
+        }
         oauth1TokenToApplicationConnector = new LRUCache<String, String>(2000);
         // Start of user code constructor_finalize
         // End of user code
diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
index cb716c07..97888c82 100644
--- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
+++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java
@@ -76,7 +76,15 @@ public class AuthenticationApplication implements Application {
     private AuthenticationApplication() {
         // Start of user code constructor_init
         // End of user code
-        oslcConsumerStoreFilename= "./oslcOAuthStore.xml";
+        var AUTH_VAR = "OAUTH_STORE_FILE";
+        final Map<String, String> env = System.getenv();
+        oslcConsumerStoreFilename = "./oslcOAuthStore.xml";
+        if (env.containsKey(AUTH_VAR)) {
+            oslcConsumerStoreFilename = env.get(AUTH_VAR);
+            log.debug("ENV variable '{}' found", AUTH_VAR);
+        } else {
+            log.debug("ENV variable '{}' not defined", AUTH_VAR);
+        }
         oauth1TokenToApplicationConnector = new LRUCache<String, String>(2000);
         // Start of user code constructor_finalize
         // End of user code