diff --git a/client/index.js b/client/index.js
index f2cf0ed844..f09d2cbbe9 100644
--- a/client/index.js
+++ b/client/index.js
@@ -1,3 +1,4 @@
+/* global __OPBEAT__ORG_ID __OPBEAT__APP_ID */
 import initOpbeat from 'opbeat-react';
 import { createOpbeatMiddleware } from 'opbeat-react/redux';
 import Rx from 'rx';
@@ -19,19 +20,16 @@ import {
   saveToColdStorage
 } from './cold-reload';
 
-import opBeat from '../opbeat-config';
-
 const localhostRE = /^(localhost|127.|0.)/;
 const enableOpbeat = !localhostRE.test(window.location.hostname);
 
-if (enableOpbeat && opBeat) {
-  const { orgId, appId } = opBeat;
-  if (!orgId || !appId) {
-    console.error('OpBeat credentials not found in ~/opbeat-config');
+if (enableOpbeat) {
+  if (!__OPBEAT__ORG_ID || !__OPBEAT__APP_ID) {
+    console.error('OpBeat credentials not found in .env');
   }
   initOpbeat({
-    orgId,
-    appId
+    orgId: __OPBEAT__ORG_ID,
+    appId: __OPBEAT__APP_ID
   });
 }
 
diff --git a/opbeat-config.js b/opbeat-config.js
deleted file mode 100644
index 6d90bd553e..0000000000
--- a/opbeat-config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  // replace these values with your app specific credentials
-  orgId: '',
-  appId: ''
-};
diff --git a/sample.env b/sample.env
index 3486cd5d14..2d4f82a7ad 100644
--- a/sample.env
+++ b/sample.env
@@ -1,5 +1,8 @@
 MONGOHQ_URL='mongodb://localhost:27017/freecodecamp'
 
+OPBEAT_FRONTEND_ORG_ID=stuff
+OPBEAT_FRONTEND_APP_ID=stuff
+
 FACEBOOK_ID=stuff
 FACEBOOK_SECRET=stuff
 
diff --git a/webpack.config.js b/webpack.config.js
index af0e03f015..d66c49ef5d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -55,7 +55,9 @@ module.exports = {
       'process.env': {
         NODE_ENV: JSON.stringify(__DEV__ ? 'development' : 'production')
       },
-      __DEVTOOLS__: !__DEV__
+      __DEVTOOLS__: !__DEV__,
+      __OPBEAT__ORG_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_ORG_ID),
+      __OPBEAT__APP_ID: JSON.stringify(process.env.OPBEAT_FRONTEND_APP_ID)
     }),
     // Use browser version of visionmedia-debug
     new webpack.NormalModuleReplacementPlugin(