diff --git a/app/index.html b/app/index.html
index 36cc067..edae105 100644
--- a/app/index.html
+++ b/app/index.html
@@ -18,12 +18,6 @@
     {{content-for "body"}}
 
     <script integrity="" src="{{rootURL}}assets/vendor.js"></script>
-    <script>
-      Raven
-        .config('https://fd3c695fa9394de48a7c69b7a322960b@sentry.io/1186914')
-        .addPlugin(Raven.Plugins.Ember)
-        .install();
-    </script>
     <script integrity="" src="{{rootURL}}assets/ccdb-web.js"></script>
 
     {{content-for "body-footer"}}
diff --git a/config/environment.js b/config/environment.js
index 6132d43..282c771 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -20,12 +20,23 @@ module.exports = function(environment) {
     APP: {
       // Here you can pass flags/options to your application instance
       // when it is created
+    },
+
+    sentry: {
+      dsn: 'https://fd3c695fa9394de48a7c69b7a322960b@sentry.io/1186914',
+      globalErrorCatching: false,
+    },
+
+    contentSecurityPolicy: {
+      'script-src': "'self' 'unsafe-inline' 'unsafe-eval'",
+      'img-src': 'data: app.getsentry.com',
     }
   };
 
   if (environment === 'development') {
     ENV.APP.API_HOST = 'http://localhost:8000';
     ENV.APP.API_NAMESPACE = 'api/v1';
+    ENV.sentry.development = true;
   }
 
   if (environment === 'test') {
diff --git a/ember-cli-build.js b/ember-cli-build.js
index cf99258..2e0af58 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -13,8 +13,5 @@ module.exports = function(defaults) {
   app.import('bower_components/bootstrap/dist/css/bootstrap.min.css');
   app.import('bower_components/bootstrap/dist/css/bootstrap-theme.min.css');
 
-  app.import('node_modules/raven-js/dist/raven.js');
-  app.import('node_modules/raven-js/dist/plugins/ember.js');
-
   return app.toTree();
 };
diff --git a/package-lock.json b/package-lock.json
index 5ae7147..0aaa8d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4152,6 +4152,52 @@
         "ember-qunit": "3.3.0"
       }
     },
+    "ember-cli-sentry": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ember-cli-sentry/-/ember-cli-sentry-3.0.0.tgz",
+      "integrity": "sha1-cuVGLSGmmbPdVNjqFcBr8r2aitc=",
+      "dev": true,
+      "requires": {
+        "broccoli-funnel": "2.0.1",
+        "broccoli-merge-trees": "2.0.0",
+        "ember-cli-babel": "6.11.0",
+        "raven-js": "3.24.1",
+        "resolve": "1.5.0"
+      },
+      "dependencies": {
+        "broccoli-funnel": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz",
+          "integrity": "sha512-C8Lnp9TVsSSiZMGEF16C0dCiNg2oJqUKwuZ1K4kVC6qRPG/2Cj/rtB5kRCC9qEbwqhX71bDbfHROx0L3J7zXQg==",
+          "dev": true,
+          "requires": {
+            "array-equal": "1.0.0",
+            "blank-object": "1.0.2",
+            "broccoli-plugin": "1.3.0",
+            "debug": "2.6.9",
+            "fast-ordered-set": "1.0.3",
+            "fs-tree-diff": "0.5.7",
+            "heimdalljs": "0.2.5",
+            "minimatch": "3.0.4",
+            "mkdirp": "0.5.1",
+            "path-posix": "1.0.0",
+            "rimraf": "2.6.2",
+            "symlink-or-copy": "1.1.8",
+            "walk-sync": "0.3.2"
+          }
+        },
+        "broccoli-merge-trees": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz",
+          "integrity": "sha1-EK6kbdXOvMi499WlTwqEpPC7kLk=",
+          "dev": true,
+          "requires": {
+            "broccoli-plugin": "1.3.0",
+            "merge-trees": "1.0.1"
+          }
+        }
+      }
+    },
     "ember-cli-shims": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz",
@@ -16109,7 +16155,8 @@
     "raven-js": {
       "version": "3.24.1",
       "resolved": "https://registry.npmjs.org/raven-js/-/raven-js-3.24.1.tgz",
-      "integrity": "sha512-p+e+yoQbq4YgXDonYIRZNL/Kov6+t5L0UNEHZeYNzjOkNNCXcwQ1Vi3pulgGBaOjqXNipkFsbpmnH7YI+GPSjw=="
+      "integrity": "sha512-p+e+yoQbq4YgXDonYIRZNL/Kov6+t5L0UNEHZeYNzjOkNNCXcwQ1Vi3pulgGBaOjqXNipkFsbpmnH7YI+GPSjw==",
+      "dev": true
     },
     "raw-body": {
       "version": "2.3.2",
diff --git a/package.json b/package.json
index 99eb3e5..ccecd38 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-qunit": "^4.0.0",
+    "ember-cli-sentry": "^3.0.0",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
@@ -56,7 +57,6 @@
   },
   "private": true,
   "dependencies": {
-    "npm": "^5.7.1",
-    "raven-js": "^3.24.1"
+    "npm": "^5.7.1"
   }
 }