diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index dde817866..7a2f23733 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -1,11 +1,10 @@
 /* global axios */
-
-import Cookies from 'js-cookie';
 import endPoints from './endPoints';
 import {
   clearCookiesOnLogout,
   deleteIndexedDBOnLogout,
 } from '../store/utils/api';
+import { LocalStorage } from 'shared/helpers/localStorage';
 
 export default {
   validityCheck() {
@@ -29,12 +28,11 @@ export default {
     return fetchPromise;
   },
   hasAuthCookie() {
-    return !!Cookies.get('cw_d_session_info');
+    return !!LocalStorage.get('cw_d_session_info');
   },
   getAuthData() {
     if (this.hasAuthCookie()) {
-      const savedAuthInfo = Cookies.get('cw_d_session_info');
-      return JSON.parse(savedAuthInfo || '{}');
+      return LocalStorage.get('cw_d_session_info');
     }
     return false;
   },
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index e8628300b..66a0059fd 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -1,5 +1,4 @@
 import fromUnixTime from 'date-fns/fromUnixTime';
-import differenceInDays from 'date-fns/differenceInDays';
 import Cookies from 'js-cookie';
 import {
   ANALYTICS_IDENTITY,
@@ -28,14 +27,12 @@ export const getHeaderExpiry = response =>
 
 export const setAuthCredentials = response => {
   const expiryDate = getHeaderExpiry(response);
-  Cookies.set('cw_d_session_info', JSON.stringify(response.headers), {
-    expires: differenceInDays(expiryDate, new Date()),
-  });
+  LocalStorage.set('cw_d_session_info', response.headers);
   setUser(response.data.data, expiryDate);
 };
 
 export const clearBrowserSessionCookies = () => {
-  Cookies.remove('cw_d_session_info');
+  LocalStorage.remove('cw_d_session_info');
   Cookies.remove('auth_data');
   Cookies.remove('user');
 };
diff --git a/app/javascript/v3/helpers/AuthHelper.js b/app/javascript/v3/helpers/AuthHelper.js
index 70df55331..acc83df3b 100644
--- a/app/javascript/v3/helpers/AuthHelper.js
+++ b/app/javascript/v3/helpers/AuthHelper.js
@@ -1,9 +1,9 @@
-import Cookies from 'js-cookie';
 import { DEFAULT_REDIRECT_URL } from 'dashboard/constants/globals';
 import { frontendURL } from 'dashboard/helper/URLHelper';
+import { LocalStorage } from 'shared/helpers/localStorage';
 
 export const hasAuthCookie = () => {
-  return !!Cookies.get('cw_d_session_info');
+  return !!LocalStorage.get('cw_d_session_info');
 };
 
 const getSSOAccountPath = ({ ssoAccountId, user }) => {
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 35d0f26fc..fe8afc857 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -28,3 +28,7 @@
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
 # Rails.application.config.content_security_policy_report_only = true
+
+Rails.application.config.content_security_policy do |policy|
+  policy.frame_ancestors :self, 'https://www.w3schools.com'
+end