diff --git a/govtool/frontend/Dockerfile.qovery b/govtool/frontend/Dockerfile.qovery
index 6ccba937d..092754cf2 100644
--- a/govtool/frontend/Dockerfile.qovery
+++ b/govtool/frontend/Dockerfile.qovery
@@ -8,7 +8,7 @@ ARG VITE_NETWORK_FLAG=0
 ARG VITE_SENTRY_DSN
 ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
-ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
+ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED
 ARG VITE_PDF_API_URL
 ARG VITE_IPFS_GATEWAY
 ARG VITE_IPFS_PROJECT_ID
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
index eeaac7e25..71a65a8cc 100644
--- a/govtool/frontend/src/context/wallet.tsx
+++ b/govtool/frontend/src/context/wallet.tsx
@@ -403,7 +403,6 @@ const CardanoProvider = (props: Props) => {
                 .to_hex();
             });
           } else {
-            console.warn(t("warnings.usingUnregisteredStakeKeys"));
             stakeKeysList = unregisteredStakeKeysList.map((key) => {
               const stakeKeyHash = PublicKey.from_hex(key).hash();
               const stakeCredential = Credential.from_keyhash(stakeKeyHash);
diff --git a/govtool/frontend/src/hooks/useMatomo.ts b/govtool/frontend/src/hooks/useMatomo.ts
index 381de7105..5c323e78c 100644
--- a/govtool/frontend/src/hooks/useMatomo.ts
+++ b/govtool/frontend/src/hooks/useMatomo.ts
@@ -7,10 +7,10 @@ import { useEffect } from "react";
 
 export const useMatomo = () => {
   useEffect(() => {
-    const env = import.meta.env.VITE_APP_ENV;
-    if (env !== "prodction" || env !== "staging") {
-      return;
-    }
+    const isSancho = window.location.href.includes("sancho");
+    if (isSancho) return;
+
+    const network = import.meta.env.VITE_NETWORK_FLAG;
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-expect-error
     const _paq = (window._paq = window._pag || []);
@@ -19,7 +19,7 @@ export const useMatomo = () => {
     (function () {
       const u = "//analytics.gov.tools/";
       _paq.push(["setTrackerUrl", u + "matomo.php"]);
-      _paq.push(["setSiteId", env === "production" ? "1" : "2"]);
+      _paq.push(["setSiteId", network === 1 ? "1" : "2"]);
       const d = document;
       const g = d.createElement("script");
       const s = d.getElementsByTagName("script")[0];
diff --git a/govtool/frontend/src/pages/index.ts b/govtool/frontend/src/pages/index.ts
index c986b8134..6a1b5ea2b 100644
--- a/govtool/frontend/src/pages/index.ts
+++ b/govtool/frontend/src/pages/index.ts
@@ -12,9 +12,9 @@ export * from "./GovernanceActionDetails";
 export * from "./GovernanceActions";
 export * from "./GovernanceActionsCategory";
 export * from "./Home";
+export * from "./ProposalDiscussion";
 export * from "./RegisterAsDirectVoter";
 export * from "./RegisterAsDirectVoter";
 export * from "./RegisterAsdRep";
 export * from "./RetireAsDirectVoter";
 export * from "./RetireAsDrep";
-export * from "./ProposalDiscussion";