diff --git a/.env b/.env
new file mode 100644
index 000000000..8c1a2e1d3
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+
+PUPPETEER_HOST = http://127.0.0.1:8080
+PUPPETEER_PORT = 8080
diff --git a/.env.example b/.env.example
new file mode 100644
index 000000000..8c1a2e1d3
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,3 @@
+
+PUPPETEER_HOST = http://127.0.0.1:8080
+PUPPETEER_PORT = 8080
diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js
index 68065baee..a3cd6fa4c 100644
--- a/jest-puppeteer.config.js
+++ b/jest-puppeteer.config.js
@@ -1,8 +1,12 @@
 // jest-puppeteer.config.js
+require('dotenv').config()
+
+const port = process.env.PUPPETEER_PORT
+
 module.exports = {
   server: {
-    command: 'http-server ./www',
-    port: 8080,
+    command: `http-server --port ${port} ./www`,
+    port: port,
     launchTimeout: 5000
   },
   
diff --git a/package-lock.json b/package-lock.json
index 4b1d6b6cd..ed0927f7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11004,6 +11004,11 @@
         "is-obj": "^2.0.0"
       }
     },
+    "dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
+    },
     "duplexer3": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
diff --git a/package.json b/package.json
index 234bf3c0f..74270ca64 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "crypto-js": "^4.0.0",
     "date-fns": "^2.17.0",
     "depd": "^2.0.0",
+    "dotenv": "^10.0.0",
     "global": "^4.4.0",
     "http-server": "^0.12.3",
     "ibm-mfp-web-push": "^8.0.2020052213",
diff --git a/readme.md b/readme.md
index 94de7ea0d..b8a812f64 100644
--- a/readme.md
+++ b/readme.md
@@ -32,6 +32,9 @@ npm run start
 ## Run test
 
 ```bash
+# incase you don't have .env file
+cp ./.env.example ./.env
+ 
 npm run jest
 ```
 
diff --git a/test/login.spec.ts b/test/login.spec.ts
index 0fe4e9c2a..57afd9699 100644
--- a/test/login.spec.ts
+++ b/test/login.spec.ts
@@ -2,21 +2,19 @@
 import { promise } from 'protractor';
 import { environment }  from './../src/environments/environment'
 
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-  
+console.log(process.env.PUPPETEER_HOST)
+
 describe('Puppeteer tests', () => {
 
     beforeAll(async () => {
-        // await page.goto('http://127.0.0.1:8080')
+        // await page.goto(process.env.PUPPETEER_HOST)
     })
 
     test('[table] login', async () => {
 
         // const browser = await puppeteer.launch({headless: false});
         await page.setViewport({width: 1200, height: 720});
-        await page.goto('http://127.0.0.1:8080'); // wait until page load
+        await page.goto(process.env.PUPPETEER_HOST); // wait until page load
         await page.waitForSelector('.btn-ok')
 
 
@@ -45,7 +43,7 @@ describe('Puppeteer tests', () => {
 
         // const browser = await puppeteer.launch({headless: false});
         await page.setViewport({width: 1200, height: 720});
-        await page.goto('http://127.0.0.1:8080'); // wait until page load
+        await page.goto(process.env.PUPPETEER_HOST); // wait until page load
         await page.waitForSelector('.btn-ok')
 
 
diff --git a/test/sdfasd.spec.ts b/test/sdfasd.spec.ts
index 465d82084..cf02437b9 100644
--- a/test/sdfasd.spec.ts
+++ b/test/sdfasd.spec.ts
@@ -5,7 +5,7 @@ import { environment }  from './../src/environments/environment'
 describe('Puppeteer tests', () => {
 
     beforeAll(async () => {
-        // await page.goto('http://127.0.0.1:8080')
+        // await page.goto(process.env.PUPPETEER_HOST)
     })
 
     test('login', async () => {