diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js
index 7d419a134..953b8cba2 100644
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -19,8 +19,7 @@ const wsLink = new WebSocketLink({
     lazy: true,
     reconnect: true,
     connectionParams: async () => {
-      const token =
-        auth.currentUser && (await auth.currentUser.getIdToken(true));
+      const token = auth.currentUser && (await auth.currentUser.getIdToken());
       if (token) {
         return {
           headers: {
@@ -35,7 +34,7 @@ const wsLink = new WebSocketLink({
 const subscriptionMiddleware = {
   applyMiddleware: async (options, next) => {
     options.authToken =
-      auth.currentUser && (await auth.currentUser.getIdToken(true));
+      auth.currentUser && (await auth.currentUser.getIdToken());
     next();
   },
 };
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index 49034bf89..e06986c13 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -1,11 +1,10 @@
 import gql from "graphql-tag";
 import jsreport from "jsreport-browser-client-dist";
 import client from "../utils/GraphQLClient";
-import cleanAxios from "./CleanAxios";
-
-const server = "https://reports.bodyshop.app";
+import axios from "axios";
+import { auth } from "../firebase/firebase.utils";
+const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 jsreport.serverUrl = server;
-jsreport.headers["Authorization"] = "Basic " + btoa("admin:admin");
 
 export default async function RenderTemplate(
   templateObject,
@@ -21,9 +20,12 @@ export default async function RenderTemplate(
   // },
 
   //Query assets that match the template name. Must be in format <<templateName>>.query
-  const jsReportQueries = await cleanAxios.get(
-    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`,
-    { headers: { Authorization: "Basic " + btoa("admin:admin") } }
+
+  jsreport.headers["Authorization"] =
+    "Bearer " + (await auth.currentUser.getIdToken());
+
+  const jsReportQueries = await axios.get(
+    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`
   );
 
   let templateQueryToExecute,