diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d5c30e745..724bb0e77 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,7 +36,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 end
 
 TASK_ID = (ENV['TASK_ID'] || 0).to_i
-CONFIG_NAME = ENV['CONFIG_NAME'] || 'browserstack'
+CONFIG_NAME = ENV['CONFIG_NAME'] || 'windows_chrome'
 CONFIG = YAML.safe_load(File.read("./spec/support/#{CONFIG_NAME}.config.yml"))
 CONFIG['user'] = ENV['BROWSERSTACK_USERNAME'] || CONFIG['user']
 CONFIG['key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || CONFIG['key']
diff --git a/spec/support/browserstack.config.yml b/spec/support/browserstack.config.yml
deleted file mode 100644
index 733243053..000000000
--- a/spec/support/browserstack.config.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-server: "hub-cloud.browserstack.com"
-user: "craigdonaldson1"
-key: "qGsnjShFp9PbmT7dvgQC"
-
-common_caps:
-  "build": "rspec-browserstack"
-  "browserstack.debug": true
-  "name": "BStack Test Run"
-
-browser_caps:
-  # OS Specific Browsers
-  -
-    "browser": "safari"
-    "os": "OS X"
-  -
-    "browser": "edge"
-    "os": "Windows"
-  -
-    "browser": "internet explorer"
-    "os": "Windows"
-  # Multi-OS Browsers
-  -
-    "browser": "chrome"
-    "os": "OS X"
-  -
-    "browser": "chrome"
-    "os": "Windows"
-  -
-    "browser": "firefox"
-    "os": "OS X"
-  -
-    "browser": "firefox"
-    "os": "Windows"
\ No newline at end of file
diff --git a/spec/support/osx_chrome.config.yml b/spec/support/osx_chrome.config.yml
new file mode 100644
index 000000000..feba734c5
--- /dev/null
+++ b/spec/support/osx_chrome.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: $BROWSERSTACK_ACCESS_KEY
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "os": "OS X"
\ No newline at end of file
diff --git a/spec/support/osx_firefox.config.yml b/spec/support/osx_firefox.config.yml
new file mode 100644
index 000000000..1efc2a83a
--- /dev/null
+++ b/spec/support/osx_firefox.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "os": "OS X"
\ No newline at end of file
diff --git a/spec/support/osx_safari.config.yml b/spec/support/osx_safari.config.yml
new file mode 100644
index 000000000..2622f055d
--- /dev/null
+++ b/spec/support/osx_safari.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "safari"
+    "os": "OS X"
\ No newline at end of file
diff --git a/spec/support/windows_chrome.config.yml b/spec/support/windows_chrome.config.yml
new file mode 100644
index 000000000..6e64d1493
--- /dev/null
+++ b/spec/support/windows_chrome.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "chrome"
+    "os": "Windows"
\ No newline at end of file
diff --git a/spec/support/windows_edge.config.yml b/spec/support/windows_edge.config.yml
new file mode 100644
index 000000000..35f46d8e4
--- /dev/null
+++ b/spec/support/windows_edge.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "edge"
+    "os": "Windows"
\ No newline at end of file
diff --git a/spec/support/windows_firefox.config.yml b/spec/support/windows_firefox.config.yml
new file mode 100644
index 000000000..8fd3f0112
--- /dev/null
+++ b/spec/support/windows_firefox.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "firefox"
+    "os": "Windows"
\ No newline at end of file
diff --git a/spec/support/windows_ie.config.yml b/spec/support/windows_ie.config.yml
new file mode 100644
index 000000000..223e1973c
--- /dev/null
+++ b/spec/support/windows_ie.config.yml
@@ -0,0 +1,13 @@
+server: "hub-cloud.browserstack.com"
+user: "craigdonaldson1"
+key: "qGsnjShFp9PbmT7dvgQC"
+
+common_caps:
+  "build": "rspec-browserstack"
+  "browserstack.debug": true
+  "name": "BStack Test Run"
+
+browser_caps:
+  -
+    "browser": "internet explorer"
+    "os": "Windows"
\ No newline at end of file