diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..28f817cb2
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* yaroslav@codefresh.io ziv@codefresh.io daniel.soifer@codefresh.io daniel.maizel@codefresh.io
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000000000..40fcca8d0
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+## What
+
+## Why
+
+## Notes
diff --git a/lib/interface/cli/commands/hybrid/init.cmd.js b/lib/interface/cli/commands/hybrid/init.cmd.js
index 21f95ba9b..3e53f84b0 100644
--- a/lib/interface/cli/commands/hybrid/init.cmd.js
+++ b/lib/interface/cli/commands/hybrid/init.cmd.js
@@ -67,14 +67,14 @@ function printInstallationOptionsSummary({
     dryRun,
     shouldUseHelm,
 }) {
-    let summary = `\n${colors.green('Installation options summary:')} 
+    let summary = `\n${colors.green('Installation options summary:')}
     1. Kubernetes Context: ${colors.cyan(kubeContextName)}
     2. Kubernetes Namespace: ${colors.cyan(kubeNamespace)}
     3. Set this as default account runtime-environment: ${colors.cyan(!!shouldMakeDefaultRe)}
     4. Execute demo pipeline after install: ${colors.cyan(!!shouldExecutePipeline)}
     5. HTTP proxy: ${httpProxy ? colors.cyan(httpProxy) : 'none'}
-    6. HTTPS proxy: ${httpsProxy ? colors.cyan(httpsProxy) : 'none'} 
-    7. No proxy: ${noProxy ? colors.cyan(noProxy) : 'none'} 
+    6. HTTPS proxy: ${httpsProxy ? colors.cyan(httpsProxy) : 'none'}
+    7. No proxy: ${noProxy ? colors.cyan(noProxy) : 'none'}
     `;
 
     if (appProxy) {
@@ -845,7 +845,7 @@ const initCmd = new Command({
             return true;
         }
 
-        const monitoringToken = _.get(sdk, 'config.context.token');
+        const userToken = _.get(sdk, 'config.context.token');
 
         // install monitoring
         installationPlan.addStep({
@@ -862,7 +862,7 @@ const initCmd = new Command({
                 'set-file': setFile,
                 'dry-run': dryRun,
                 'bypass-download': bypassDownload,
-                token: monitoringToken,
+                token: userToken,
                 verbose,
                 noExit: true, // to prevent if from calling inner: process.exit()
                 url,
@@ -891,7 +891,7 @@ const initCmd = new Command({
                 const monitor = {
                     enabled: shouldInstallMonitoringFn(),
                     clusterId: kubeContextName,
-                    token: monitoringToken,
+                    token: userToken,
                 };
 
                 const global = {
@@ -902,6 +902,7 @@ const initCmd = new Command({
                     agentName: agent.name,
                     accountId: agent.account,
                     runtimeName: runtimeNameContext,
+                    codefreshToken: userToken,
                     keys,
                 };
 
diff --git a/package.json b/package.json
index c21d45376..b8024d294 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.84.7",
+  "version": "0.84.8",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -115,4 +115,4 @@
       "./test-setup.js"
     ]
   }
-}
+}
\ No newline at end of file