diff --git a/components/ui/__tests__/tab.spec.js b/components/ui/__tests__/tab.spec.js
index de3a754d8..577d241f7 100644
--- a/components/ui/__tests__/tab.spec.js
+++ b/components/ui/__tests__/tab.spec.js
@@ -1,14 +1,24 @@
 import tab from "../tab"
 import { mount } from "@vue/test-utils"
 
-const factory = (props, data) =>
-  mount(tab, {
-    propsData: props,
-    data: data ? () => data : undefined,
-    slots: {
-      default: '<div id="testdiv"></div>',
-    },
-  })
+const factory = (props, data) => {
+  if (data) {
+    return mount(tab, {
+      propsData: props,
+      data: () => data,
+      slots: {
+        default: '<div id="testdiv"></div>',
+      },
+    })
+  } else {
+    return mount(tab, {
+      propsData: props,
+      slots: {
+        default: '<div id="testdiv"></div>',
+      },
+    })
+  }
+}
 
 describe("tab", () => {
   test("mounts properly when needed props are passed in", () => {
diff --git a/nuxt.config.js b/nuxt.config.js
index 307c813c6..805be0230 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,3 @@
-require("dotenv").config()
 // Some helpful application constants.
 // TODO: Use these when rendering the pages (rather than just for head/meta tags...)
 export const options = {
@@ -119,8 +118,6 @@ export default {
   buildModules: [
     // https://pwa.nuxtjs.org
     "@nuxtjs/pwa",
-    // Doc: https://github.com/nuxt-community/dotenv-module
-    "@nuxtjs/dotenv",
     // Doc: https://github.com/nuxt-community/analytics-module
     "@nuxtjs/google-analytics",
     // Doc: https://github.com/nuxt-community/gtm-module
@@ -168,13 +165,13 @@ export default {
     keepOnHover: true,
   },
   googleAnalytics: {
-    id: process.env.GA_ID || "UA-61422507-4",
+    id: process.env.GA_ID,
   },
   gtm: {
-    id: process.env.GTM_ID || "GTM-NMKVBMV",
+    id: process.env.GTM_ID,
   },
   sitemap: {
-    hostname: process.env.BASE_URL || "https://hoppscotch.io/",
+    hostname: process.env.BASE_URL,
   },
   robots: {
     UserAgent: "*",
@@ -182,17 +179,6 @@ export default {
     Allow: "/",
     Sitemap: `${process.env.BASE_URL}sitemap.xml`,
   },
-  env: {
-    API_KEY: process.env.API_KEY,
-    AUTH_DOMAIN: process.env.AUTH_DOMAIN,
-    DATABASE_URL: process.env.DATABASE_URL,
-    PROJECT_ID: process.env.PROJECT_ID,
-    STORAGE_BUCKET: process.env.STORAGE_BUCKET,
-    MESSAGING_SENDER_ID: process.env.MESSAGING_SENDER_ID,
-    APP_ID: process.env.APP_ID,
-    MEASUREMENT_ID: process.env.MEASUREMENT_ID,
-    BASE_URL: process.env.BASE_URL,
-  },
   i18n: {
     locales: [
       {
@@ -311,4 +297,19 @@ export default {
   generate: {
     fallback: true,
   },
+  publicRuntimeConfig: {
+    GA_ID: process.env.GA_ID || "UA-61422507-4",
+    GTM_ID: process.env.GTM_ID || "GTM-NMKVBMV",
+    BASE_URL: process.env.BASE_URL || "/",
+  },
+  privateRuntimeConfig: {
+    API_KEY: process.env.API_KEY,
+    AUTH_DOMAIN: process.env.AUTH_DOMAIN,
+    DATABASE_URL: process.env.DATABASE_URL,
+    PROJECT_ID: process.env.PROJECT_ID,
+    STORAGE_BUCKET: process.env.STORAGE_BUCKET,
+    MESSAGING_SENDER_ID: process.env.MESSAGING_SENDER_ID,
+    APP_ID: process.env.APP_ID,
+    MEASUREMENT_ID: process.env.MEASUREMENT_ID,
+  },
 }
diff --git a/package-lock.json b/package-lock.json
index 01911ee96..2ba6524be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2317,16 +2317,6 @@
         "defu": "^3.1.0"
       }
     },
-    "@nuxtjs/dotenv": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/dotenv/-/dotenv-1.4.1.tgz",
-      "integrity": "sha512-DpdObsvRwC8d89I9mzz6pBg6e/PEXHazDM57DOI1mmML2ZjHfQ/DvkjlSzUL7T+TnW3b/a4Ks5wQx08DqFBmeQ==",
-      "dev": true,
-      "requires": {
-        "consola": "^2.10.1",
-        "dotenv": "^8.1.0"
-      }
-    },
     "@nuxtjs/google-analytics": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/@nuxtjs/google-analytics/-/google-analytics-2.4.0.tgz",
@@ -3091,9 +3081,9 @@
       }
     },
     "@vue/test-utils": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.4.tgz",
-      "integrity": "sha512-uIdDqFauzNJWlhltLSZU+P3uHEgUQczklSv2b1EKC7JzxBg9OY/5sx8UyuJwBD+zuxidhFZ4SjTuPgr8cdf63w==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.5.tgz",
+      "integrity": "sha512-P2x8kXwqfTXesAdfJQN146V1S3QD3Xv9wYZ1B09Oecmg7I3Fpqqo1CwfIn5ivwuXyBPQWFDH4vyBHynnYjIkRg==",
       "dev": true,
       "requires": {
         "dom-event-types": "^1.0.0",
diff --git a/package.json b/package.json
index 3cda6c55e..4ccde7b87 100644
--- a/package.json
+++ b/package.json
@@ -50,12 +50,11 @@
   "devDependencies": {
     "@babel/core": "^7.11.4",
     "@babel/preset-env": "^7.11.0",
-    "@nuxtjs/dotenv": "^1.4.1",
     "@nuxtjs/google-analytics": "^2.4.0",
     "@nuxtjs/pwa": "^3.0.2",
     "@nuxtjs/svg": "^0.1.12",
     "@testing-library/jest-dom": "^5.11.4",
-    "@vue/test-utils": "^1.0.4",
+    "@vue/test-utils": "^1.0.5",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^26.3.0",
     "eslint": "^7.7.0",