diff --git a/lib/ServerlessProviderAws.js b/lib/ServerlessProviderAws.js
index 49def1928..e9c48a2d4 100644
--- a/lib/ServerlessProviderAws.js
+++ b/lib/ServerlessProviderAws.js
@@ -119,7 +119,7 @@ class ServerlessProviderAws {
       // Access Keys w/ Stage Suffix
       credentials = {
         accessKeyId:     process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID_' + stage],
-        secretAccessKey: process.env[this._config.envPrefix + 'SECRET_ACCESS_KEY_' + stage]
+        secretAccessKey: process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY_' + stage]
       };
 
     } else if ((process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID'] && process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY'])
@@ -128,7 +128,7 @@ class ServerlessProviderAws {
       // Access Keys Plain
       credentials = {
         accessKeyId:     process.env[this._config.envPrefix + 'AWS_ACCESS_KEY_ID'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_ACCESS_KEY_ID'],
-        secretAccessKey: process.env[this._config.envPrefix + 'SECRET_ACCESS_KEY'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_SECRET_ACCESS_KEY']
+        secretAccessKey: process.env[this._config.envPrefix + 'AWS_SECRET_ACCESS_KEY'] || process.env[this._config.envPrefix + 'SERVERLESS_ADMIN_AWS_SECRET_ACCESS_KEY']
       };
 
     } else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]) {
@@ -138,7 +138,7 @@ class ServerlessProviderAws {
         sessionToken:    process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]
       };
 
-    } else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN_' + stage]) {
+    } else if (process.env[this._config.envPrefix + 'AWS_SESSION_TOKEN']) {
 
       // Session Token Plain
       credentials = {