diff --git a/okta.yaml b/okta.yaml
new file mode 100644
index 000000000..a78bb3f61
--- /dev/null
+++ b/okta.yaml
@@ -0,0 +1,4 @@
+okta:
+  client:
+    orgUrl: null
+    token: null
diff --git a/src/config-loader.js b/src/config-loader.js
index 3fc4aa2a1..946a997e1 100644
--- a/src/config-loader.js
+++ b/src/config-loader.js
@@ -68,7 +68,7 @@ class ConfigLoader {
   }
 
   applyYamlFile(path) {
-    this.apply(yaml.safeLoad(fs.readFileSync(path)));
+    this.apply(yaml.safeLoad(fs.readFileSync(path)).okta);
   }
 
   apply(config) {
diff --git a/test/unit/config-loader.js b/test/unit/config-loader.js
index beeceb143..95b29bd71 100644
--- a/test/unit/config-loader.js
+++ b/test/unit/config-loader.js
@@ -36,8 +36,10 @@ describe('ConfigLoader', () => {
 
     it('should override defaults with ~/.okta/okta.yaml file', () => {
       fakeFs.file(path.join(os.homedir(), '.okta', 'okta.yaml'), yaml.safeDump({
-        client: {
-          orgUrl: 'foo'
+        okta: {
+          client: {
+            orgUrl: 'foo'
+          }
         }
       }));
       loader.applyDefaults();
@@ -51,8 +53,10 @@ describe('ConfigLoader', () => {
 
     it('should override ~/.okta/okta.yaml with okta.yaml in the process context', () => {
       fakeFs.file(path.join(process.cwd(), 'okta.yaml'), yaml.safeDump({
-        client: {
-          orgUrl: 'bar'
+        okta: {
+          client: {
+            orgUrl: 'bar'
+          }
         }
       }));
       loader.applyDefaults();