diff --git a/src/login.ts b/src/login.ts
index a2d751a..9c51882 100644
--- a/src/login.ts
+++ b/src/login.ts
@@ -102,6 +102,17 @@ export async function setContext(kubeconfigPath: string) {
     }
 }
 
+export async function setContext(kubeconfigPath: string) {
+  let namespace = core.getInput('namespace');
+  if (namespace) {
+      //To use kubectl commands, the environment variable KUBECONFIG needs to be set for this step 
+      process.env['KUBECONFIG'] = kubeconfigPath;
+      const kubectlPath = await getKubectlPath();
+      var toolRunner = new ToolRunner(kubectlPath, ['config', 'set-context', '--current', `--namespace="${namespace}"`]);
+      await toolRunner.exec();
+  }
+}
+
 export async function run() {
     try {
         let kubeconfig = '';
@@ -124,6 +135,7 @@ export async function run() {
             core.exportVariable('KUBECONFIG', kubeconfigPath);
             console.log('KUBECONFIG environment variable is set');
             await setContext(kubeconfigPath);
+            await setContext(kubeconfigPath);
         }
     } catch (ex) {
         return Promise.reject(ex);