diff --git a/src/components/withEnvironment.js b/src/components/withEnvironment.js
index 66b934bf51a6..b7d1c76de9d7 100644
--- a/src/components/withEnvironment.js
+++ b/src/components/withEnvironment.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import Environment from '../libs/Environment';
+import {getEnvironment} from '../libs/Environment/Environment';
 import CONST from '../CONST';
 import getComponentDisplayName from '../libs/getComponentDisplayName';
 
@@ -20,7 +20,7 @@ export default function (WrappedComponent) {
         }
 
         componentDidMount() {
-            Environment.getEnvironment()
+            getEnvironment()
                 .then((environment) => {
                     this.setState({environment});
                 });
diff --git a/src/libs/Environment/Environment.js b/src/libs/Environment/Environment.js
new file mode 100644
index 000000000000..a3bfd2663db6
--- /dev/null
+++ b/src/libs/Environment/Environment.js
@@ -0,0 +1,18 @@
+import Config from 'react-native-config';
+import lodashGet from 'lodash/get';
+import CONST from '../../CONST';
+import getEnvironment from './getEnvironment';
+
+/**
+ * Are we running the app in development?
+ *
+ * @return {boolean}
+ */
+function isDevelopment() {
+    return lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.DEV;
+}
+
+export {
+    getEnvironment,
+    isDevelopment,
+};
diff --git a/src/libs/Environment/betaChecker/index.js b/src/libs/Environment/betaChecker/index.js
new file mode 100644
index 000000000000..9d0d4af5741b
--- /dev/null
+++ b/src/libs/Environment/betaChecker/index.js
@@ -0,0 +1,12 @@
+/**
+ * There's no beta build in non native
+ *
+ * @returns {Promise}
+ */
+function isBetaBuild() {
+    return Promise.resolve(false);
+}
+
+export default {
+    isBetaBuild,
+};
diff --git a/src/libs/Environment/index.js b/src/libs/Environment/getEnvironment/index.js
similarity index 55%
rename from src/libs/Environment/index.js
rename to src/libs/Environment/getEnvironment/index.js
index 974d7590fffd..a987678d6a6e 100644
--- a/src/libs/Environment/index.js
+++ b/src/libs/Environment/getEnvironment/index.js
@@ -1,6 +1,6 @@
-import Config from 'react-native-config';
 import lodashGet from 'lodash/get';
-import CONST from '../../CONST';
+import Config from 'react-native-config';
+import CONST from '../../../CONST';
 
 /**
  * Returns a promise that resolves with the current environment string value
@@ -8,9 +8,7 @@ import CONST from '../../CONST';
  * @returns {Promise}
  */
 function getEnvironment() {
-    return new Promise(resolve => resolve(lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV)));
+    return Promise.resolve(lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV));
 }
 
-export default {
-    getEnvironment,
-};
+export default getEnvironment;
diff --git a/src/libs/Environment/index.native.js b/src/libs/Environment/getEnvironment/index.native.js
similarity index 89%
rename from src/libs/Environment/index.native.js
rename to src/libs/Environment/getEnvironment/index.native.js
index e8b451810ed3..89547e0ee54d 100644
--- a/src/libs/Environment/index.native.js
+++ b/src/libs/Environment/getEnvironment/index.native.js
@@ -1,7 +1,7 @@
 import lodashGet from 'lodash/get';
 import Config from 'react-native-config';
-import betaChecker from './betaChecker';
-import CONST from '../../CONST';
+import betaChecker from '../betaChecker';
+import CONST from '../../../CONST';
 
 let environment = null;
 
@@ -31,6 +31,4 @@ function getEnvironment() {
     });
 }
 
-export default {
-    getEnvironment,
-};
+export default getEnvironment;
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
index 62ee60c5173c..f554fa45bb43 100644
--- a/src/libs/Permissions.js
+++ b/src/libs/Permissions.js
@@ -1,5 +1,6 @@
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
+import {isDevelopment} from './Environment/Environment';
 import CONST from '../CONST';
 import ONYXKEYS from '../ONYXKEYS';
 
@@ -14,7 +15,7 @@ Onyx.connect({
  * @returns {Boolean}
  */
 function canUseAllBetas() {
-    return _.contains(betas, CONST.BETAS.ALL);
+    return isDevelopment() || _.contains(betas, CONST.BETAS.ALL);
 }
 
 /**
