diff --git a/ui/config/targets.js b/ui/config/targets.js
index 96e6c7feed..68b79980e8 100644
--- a/ui/config/targets.js
+++ b/ui/config/targets.js
@@ -1,15 +1,10 @@
 'use strict';
 
-const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];
-
-const isCI = Boolean(process.env.CI);
-const isProduction = process.env.EMBER_ENV === 'production';
-
-// TODO CBS: Remove ie 11
-if (isCI || isProduction) {
-  browsers.push('ie 11');
-}
-
 module.exports = {
-  browsers,
+  browsers: [
+    'last 1 edge versions',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions',
+  ],
 };
diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js
index 45eaeeb8c0..4bca0a1193 100644
--- a/ui/ember-cli-build.js
+++ b/ui/ember-cli-build.js
@@ -44,8 +44,7 @@ const appConfig = {
   autoprefixer: {
     enabled: isTest || isProd,
     grid: true,
-    // TODO CBS: Remove IE
-    browsers: ['defaults', 'ie 11'],
+    browsers: ['defaults'],
   },
   autoImport: {
     forbidEval: true,
diff --git a/ui/testem.browserstack.js b/ui/testem.browserstack.js
index 06cb3594d0..05f4c8724c 100644
--- a/ui/testem.browserstack.js
+++ b/ui/testem.browserstack.js
@@ -83,7 +83,7 @@ module.exports = {
     },
   },
   launch_in_dev: [],
-  launch_in_ci: ['BS_IE_11'],
+  launch_in_ci: ['BS_Firefox_Current'],
   proxies: {
     '/v1': {
       target: 'http://localhost:9200',