diff --git a/README.md b/README.md
index 2e3462d..3581cde 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,14 @@ and then open [Logz.io](https://app.logz.io/#/dashboard/metrics).
 
 ## Changelong
 
+1.1.9:
+
+-   Add support to run a tests on different mobile devices
+
+1.1.8:
+
+-   Add Option to choose device where need to run user flow
+
 1.1.7:
 
 -   Add first invocation after cloud function was uploaded
diff --git a/client/src/containers/EditCodeContainer/index.tsx b/client/src/containers/EditCodeContainer/index.tsx
index e03124a..d877acf 100644
--- a/client/src/containers/EditCodeContainer/index.tsx
+++ b/client/src/containers/EditCodeContainer/index.tsx
@@ -2,11 +2,14 @@ import React, { FunctionComponent, useState } from 'react';
 import styled from 'styled-components';
 
 import CodeEditor from '../../components/CodeEditor';
-import EnvVariableWrapper from '../EnvVariableContainer';
+import EnvVariableContainer from '../EnvVariableContainer';
 import Text from '../../components/Text';
 import Select from '../../components/Select';
 
-import { availableCodeLanguages } from '../../utils/selectOptions';
+import {
+    availableCodeLanguages,
+    platformDevice,
+} from '../../utils/selectOptions';
 import Button from '../../components/Button';
 
 import api from '../../utils/api';
@@ -19,7 +22,10 @@ const ContainerDiv = styled.div`
     max-width: 1280px;
     padding-bottom: 24px;
 `;
-
+const SideWrapper = styled.div`
+    width: 27%;
+    margin-right: 0;
+`;
 const TopWrapper = styled.div`
     margin-bottom: 24px;
     display: flex;
@@ -46,7 +52,12 @@ const SelectWrapper = styled.div`
     max-width: 215px;
     width: 100%;
 `;
-
+const SelectWrapperDevice = styled.div`
+    position: relative;
+    width: 100%;
+    margin-top: 10px;
+    margin-bottom: 30px;
+`;
 const MainWrapper = styled.div`
     display: flex;
     justify-content: space-between;
@@ -85,15 +96,19 @@ type EnvVariable = {
 interface IProps {
     uniqueKey: (isUnique: boolean) => void;
     codeSnippet: string;
+    testDevice: string;
     setCodeSnippet: (val: string) => void;
     setEnvVariable: (envVariable: EnvVariable[]) => void;
+    setTestDevice: (val: string) => void;
 }
 
 const EditCodeContainer: FunctionComponent<IProps> = ({
     uniqueKey,
     codeSnippet,
+    testDevice,
     setCodeSnippet,
     setEnvVariable,
+    setTestDevice,
 }) => {
     const [codeLanguage, setCodeLanguage] = useState<string>('Playwright');
     const [loading, setLoading] = useState<boolean>(false);
@@ -102,7 +117,9 @@ const EditCodeContainer: FunctionComponent<IProps> = ({
     const onChangeSelect = (option: string) => {
         setCodeLanguage(option);
     };
-
+    const onChangeSelectDevice = (option: string) => {
+        setTestDevice(option);
+    };
     const startTestLocally = async () => {
         setTestStatus('');
         if (!isCodeValid) {
@@ -111,7 +128,7 @@ const EditCodeContainer: FunctionComponent<IProps> = ({
         }
 
         setLoading(true);
-        const response = await api.testLocal(codeSnippet);
+        const response = await api.testLocal(codeSnippet, testDevice);
 
         if (response!.error && response!.errorData) {
             setTestStatus(response!.errorData);
@@ -157,10 +174,24 @@ const EditCodeContainer: FunctionComponent<IProps> = ({
                         setCodeSnippet={setCodeSnippet}
                         codeSnippet={codeSnippet}
                     />
-                    <EnvVariableWrapper
-                        uniqueKey={uniqueKey}
-                        onSetListEnvVariable={setEnvVariable}
-                    />
+                    <SideWrapper>
+                        <Text tag='h2'>Select Device</Text>
+                        <Text tag={'p'}>
+                            Select the device on which you would like to execute
+                            the test.
+                        </Text>
+                        <SelectWrapperDevice>
+                            <Select
+                                options={platformDevice}
+                                onChangeSelect={onChangeSelectDevice}
+                                currentValue={testDevice}
+                            />
+                        </SelectWrapperDevice>
+                        <EnvVariableContainer
+                            uniqueKey={uniqueKey}
+                            onSetListEnvVariable={setEnvVariable}
+                        />
+                    </SideWrapper>
                 </MainWrapper>
                 <BottomWrapper>
                     <Text tag={'p'}>
diff --git a/client/src/containers/EnvVariableContainer/index.tsx b/client/src/containers/EnvVariableContainer/index.tsx
index 05d8485..f50f585 100644
--- a/client/src/containers/EnvVariableContainer/index.tsx
+++ b/client/src/containers/EnvVariableContainer/index.tsx
@@ -11,7 +11,7 @@ import { containsKeys } from '../../utils/validate';
 import { findObjectInArray } from '../../utils/helper';
 
 const EnvVariableWrapper = styled.div`
-    width: 27%;
+    width: 100%;
     margin-right: 0;
 `;
 
@@ -101,10 +101,10 @@ const EnvVariableContainer: FunctionComponent<IProps> = ({
     };
     return (
         <EnvVariableWrapper>
-            <Text tag='h2'>Enviroment Variable</Text>
+            <Text tag='h2'>Secrets Management</Text>
             <Text tag={'p'}>
-                Add key-value pairs for the environment variables that you use
-                in the script.
+                Include key-value pairs for your confidential information, which
+                you can then employ as environment variables in your script.
             </Text>
             <EnvVariableDisplay>
                 {renderEnvVariableHandler()}
diff --git a/client/src/page/Home/index.tsx b/client/src/page/Home/index.tsx
index c310ee6..467421a 100644
--- a/client/src/page/Home/index.tsx
+++ b/client/src/page/Home/index.tsx
@@ -79,6 +79,8 @@ const Home: FunctionComponent = () => {
         errorTitle: '',
     });
     const [codeSnippet, setCodeSnippet] = useState<string>(DEFAULT_CODE);
+    const [testDevice, setTestDevice] = useState<string>('Desktop Chrome');
+
     const [activeStep, setActiveStep] = useState<string>('edit_code');
     const [stageDeploy, setStageDeploy] = useState<StatusProps>({
         message: 'Function creating...',
@@ -156,6 +158,7 @@ const Home: FunctionComponent = () => {
 
             response = await api.downloadCFTemplate(
                 codeSnippet,
+                testDevice,
                 envList,
                 configs.name.value,
                 rangeTimeVariable[
@@ -195,6 +198,7 @@ const Home: FunctionComponent = () => {
                 rangeTimeVariable[
                     activeRangeTime.split(' ').reverse().join('_')
                 ],
+                testDevice,
                 codeSnippet,
                 configs.name.value,
                 configs.accessKey.value,
@@ -285,9 +289,11 @@ const Home: FunctionComponent = () => {
                 {activeStep === 'edit_code' ? (
                     <EditCodeContainer
                         uniqueKey={uniqueEnvVariableHandler}
+                        testDevice={testDevice}
                         codeSnippet={codeSnippet}
                         setCodeSnippet={onSetCodeSnippetHandler}
                         setEnvVariable={onSetEnvVariableHandler}
+                        setTestDevice={setTestDevice}
                     />
                 ) : (
                     <ExportDeploy
diff --git a/client/src/utils/api.ts b/client/src/utils/api.ts
index f9e2899..bd7e111 100644
--- a/client/src/utils/api.ts
+++ b/client/src/utils/api.ts
@@ -65,10 +65,11 @@ class Api {
 	};
 
 
-	testLocal = async (codeSnippet: string) => {
+	testLocal = async (codeSnippet: string, testDevice: string) => {
 		const responseLocal = await this.customFetch(
 			{
 				code: codeSnippet,
+				testDevice
 
 			},
 			settings.endPointUrls.modifyFileLocalUrl,
@@ -83,10 +84,10 @@ class Api {
 		}
 	};
 
-	initPage = async (rangeTime: number, codeSnippet: string, name: string, accessKey: string, secretKey: string, bucketName: string, token: string, listenerUrl: string, region: string, listEnvVariables: object, onStage: (stage: StatusProps) => void, description?: string) => {
+	initPage = async (rangeTime: number, testDevice: string, codeSnippet: string, name: string, accessKey: string, secretKey: string, bucketName: string, token: string, listenerUrl: string, region: string, listEnvVariables: object, onStage: (stage: StatusProps) => void, description?: string) => {
 
 		const responseModify = await this.customFetch(
-			{ code: codeSnippet },
+			{ code: codeSnippet, testDevice },
 			settings.endPointUrls.modifyFileUrl,
 		);
 
@@ -164,6 +165,7 @@ class Api {
 		const response = await this.customFetch(
 			{
 				name,
+				testDevice,
 				description,
 				accessKey,
 				secretKey,
@@ -172,6 +174,7 @@ class Api {
 				region,
 				listEnvVariables,
 				listenerUrl,
+
 			},
 			settings.endPointUrls.createLambdaUrl,
 		);
@@ -223,11 +226,11 @@ class Api {
 			return cloudBridgeEventResp;
 		}
 	};
-	downloadCFTemplate = async (codeSnippet: string, envList: object, name: string, rangeTime: number, bucket: string, token: string, region: string, listener: string, onDownload: (step: boolean) => void, description?: string) => {
+	downloadCFTemplate = async (codeSnippet: string, testDevice: string, envList: object, name: string, rangeTime: number, bucket: string, token: string, region: string, listener: string, onDownload: (step: boolean) => void, description?: string) => {
 		onDownload(true)
 
 		const responseModify = await this.customFetch(
-			{ code: codeSnippet },
+			{ code: codeSnippet, testDevice },
 			settings.endPointUrls.modifyFileUrl,
 		);
 		if (!responseModify.error) {
diff --git a/client/src/utils/constants.ts b/client/src/utils/constants.ts
index ae0c887..a4f5a68 100644
--- a/client/src/utils/constants.ts
+++ b/client/src/utils/constants.ts
@@ -8,7 +8,7 @@ export const DEFAULT_CODE = `const playwright = require('playwright-aws-lambda')
 		browser = await playwright.launchChromium(false);
 		context = await browser.newContext({
 			recordHar: {
-				path: './capture-hars/example.har',
+				path: './capture-hars/page.har',
 				mode: 'full',
 				content: 'omit',
 			},
diff --git a/client/src/utils/selectOptions.ts b/client/src/utils/selectOptions.ts
index 0369831..70efe22 100644
--- a/client/src/utils/selectOptions.ts
+++ b/client/src/utils/selectOptions.ts
@@ -68,4 +68,115 @@ export const awsRegions = [
 	{ name: 'af-south-1', default: false, isDisabled: false },
 	{ name: 'us-gov-west-1', default: false, isDisabled: false },
 	{ name: 'us-gov-east-1', default: false, isDisabled: false },
+]
+
+export const platformDevice = [
+	{ name: 'Desktop Chrome', default: true, isDisabled: false },
+	{ name: 'Blackberry PlayBook', default: false, isDisabled: false },
+	{ name: 'Blackberry PlayBook landscape', default: false, isDisabled: false },
+	{ name: 'BlackBerry Z30', default: false, isDisabled: false },
+	{ name: 'BlackBerry Z30 landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy Note 3', default: false, isDisabled: false },
+	{ name: 'Galaxy Note 3 landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy Note II', default: false, isDisabled: false },
+	{ name: 'Galaxy Note II landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy S III', default: false, isDisabled: false },
+	{ name: 'Galaxy S III landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy S5', default: false, isDisabled: false },
+	{ name: 'Galaxy S5 landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy S8', default: false, isDisabled: false },
+	{ name: 'Galaxy S8 landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy S9+', default: false, isDisabled: false },
+	{ name: 'Galaxy S9+ landscape', default: false, isDisabled: false },
+	{ name: 'Galaxy Tab S4', default: false, isDisabled: false },
+	{ name: 'Galaxy Tab S4 landscape', default: false, isDisabled: false },
+	{ name: 'iPad (gen 6)', default: false, isDisabled: false },
+	{ name: 'iPad (gen 6) landscape', default: false, isDisabled: false },
+	{ name: 'iPad (gen 7)', default: false, isDisabled: false },
+	{ name: 'iPad (gen 7) landscape', default: false, isDisabled: false },
+	{ name: 'iPad Mini', default: false, isDisabled: false },
+	{ name: 'iPad Mini landscape', default: false, isDisabled: false },
+	{ name: 'iPad Pro 11', default: false, isDisabled: false },
+	{ name: 'iPad Pro 11 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 6', default: false, isDisabled: false },
+	{ name: 'iPhone 6 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 6 Plus', default: false, isDisabled: false },
+	{ name: 'iPhone 6 Plus landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 7', default: false, isDisabled: false },
+	{ name: 'iPhone 7 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 7 Plus', default: false, isDisabled: false },
+	{ name: 'iPhone 7 Plus landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 8', default: false, isDisabled: false },
+	{ name: 'iPhone 8 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 8 Plus', default: false, isDisabled: false },
+	{ name: 'iPhone 8 Plus landscape', default: false, isDisabled: false },
+	{ name: 'iPhone SE', default: false, isDisabled: false },
+	{ name: 'iPhone SE landscape', default: false, isDisabled: false },
+	{ name: 'iPhone X', default: false, isDisabled: false },
+	{ name: 'iPhone X landscape', default: false, isDisabled: false },
+	{ name: 'iPhone XR', default: false, isDisabled: false },
+	{ name: 'iPhone XR landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 11', default: false, isDisabled: false },
+	{ name: 'iPhone 11 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 11 Pro', default: false, isDisabled: false },
+	{ name: 'iPhone 11 Pro landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 11 Pro Max', default: false, isDisabled: false },
+	{ name: 'iPhone 11 Pro Max landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 12', default: false, isDisabled: false },
+	{ name: 'iPhone 12 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Pro', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Pro landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Pro Max', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Pro Max landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Mini', default: false, isDisabled: false },
+	{ name: 'iPhone 12 Mini landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 13', default: false, isDisabled: false },
+	{ name: 'iPhone 13 landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Pro', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Pro landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Pro Max', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Pro Max landscape', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Mini', default: false, isDisabled: false },
+	{ name: 'iPhone 13 Mini landscape', default: false, isDisabled: false },
+	{ name: 'Kindle Fire HDX', default: false, isDisabled: false },
+	{ name: 'Kindle Fire HDX landscape', default: false, isDisabled: false },
+	{ name: 'LG Optimus L70', default: false, isDisabled: false },
+	{ name: 'LG Optimus L70 landscape', default: false, isDisabled: false },
+	{ name: 'Microsoft Lumia 550', default: false, isDisabled: false },
+	{ name: 'Microsoft Lumia 550 landscape', default: false, isDisabled: false },
+	{ name: 'Microsoft Lumia 950', default: false, isDisabled: false },
+	{ name: 'Microsoft Lumia 950 landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 10', default: false, isDisabled: false },
+	{ name: 'Nexus 10 landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 4', default: false, isDisabled: false },
+	{ name: 'Nexus 4 landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 5', default: false, isDisabled: false },
+	{ name: 'Nexus 5 landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 5X', default: false, isDisabled: false },
+	{ name: 'Nexus 5X landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 6', default: false, isDisabled: false },
+	{ name: 'Nexus 6 landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 6P', default: false, isDisabled: false },
+	{ name: 'Nexus 6P landscape', default: false, isDisabled: false },
+	{ name: 'Nexus 7', default: false, isDisabled: false },
+	{ name: 'Nexus 7 landscape', default: false, isDisabled: false },
+	{ name: 'Nokia Lumia 520', default: false, isDisabled: false },
+	{ name: 'Nokia Lumia 520 landscape', default: false, isDisabled: false },
+	{ name: 'Nokia N9', default: false, isDisabled: false },
+	{ name: 'Nokia N9 landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 2', default: false, isDisabled: false },
+	{ name: 'Pixel 2 landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 2 XL', default: false, isDisabled: false },
+	{ name: 'Pixel 2 XL landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 3', default: false, isDisabled: false },
+	{ name: 'Pixel 3 landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 4', default: false, isDisabled: false },
+	{ name: 'Pixel 4 landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 4a (5G)', default: false, isDisabled: false },
+	{ name: 'Pixel 4a (5G) landscape', default: false, isDisabled: false },
+	{ name: 'Pixel 5', default: false, isDisabled: false },
+	{ name: 'Pixel 5 landscape', default: false, isDisabled: false },
+	{ name: 'Moto G4', default: false, isDisabled: false },
+	{ name: 'Moto G4 landscape', default: false, isDisabled: false },
+
 ]
\ No newline at end of file
diff --git a/controllers/creator.js b/controllers/creator.js
index 8eec309..9bfcf7f 100644
--- a/controllers/creator.js
+++ b/controllers/creator.js
@@ -12,10 +12,10 @@ const { setupCFTemplate } = require('../utils/setup-cf-template');
 const { fileToZipCF } = require('../utils/zip-cf-creator');
 
 exports.modifyFile = async (req, res) => {
-    const { code } = req.body;
+    const { code, testDevice } = req.body;
 
     try {
-        const data = await updateFile(code);
+        const data = await updateFile(code, testDevice);
         if (data.error) {
             throw Error(data.err);
         }
@@ -81,6 +81,7 @@ exports.uploadZipToS3 = async (req, res) => {
 exports.createLambda = async (req, res) => {
     const {
         name,
+        testDevice,
         description,
         token,
         bucketName,
@@ -93,6 +94,7 @@ exports.createLambda = async (req, res) => {
     try {
         const lambdaResp = await createLambda(
             name,
+            testDevice,
             description,
             token,
             bucketName,
@@ -138,10 +140,10 @@ exports.addEventBridge = async (req, res) => {
 };
 
 exports.modifyFileLocally = async (req, res) => {
-    const { code } = req.body;
+    const { code, testDevice } = req.body;
 
     try {
-        const resp = await updateFileLocal(code);
+        const resp = await updateFileLocal(code, testDevice);
         if (resp) {
             let statusTest;
             shell.exec(
diff --git a/helper/index-config.js b/helper/index-config.js
index 297e37a..7b59910 100644
--- a/helper/index-config.js
+++ b/helper/index-config.js
@@ -1,4 +1,45 @@
 module.exports = {
+    startFileDeviceSelection: `const playwright = require('playwright-aws-lambda');
+	const {  devices } = require('playwright');
+	const path = require('path');
+	const readSendData = require('./rsData');
+	const cfnResponse = require('cfn-response-async');
+
+	const firstRun = async (event, context) => {
+		await regularRun();
+	
+		return await cfnResponse.send(
+			event,
+			context,
+			'SUCCESS',
+			{},
+			'first-invoke-id',
+		);
+	};
+
+	const regularRun = async () => {
+		const mobileDevice = devices['NAME_OF_DEVICE'];
+
+		let context = null;
+		let err = null;
+		let page = null;
+		let browser = null;
+
+		try {
+			browser = await playwright.launchChromium(false);
+			context = await browser.newContext({
+				recordHar: {
+					path: path.join(__dirname, '..', '..', 'tmp', 'page.har'),
+					mode: 'full',
+					content: 'omit',
+				},
+				...mobileDevice
+
+			});
+			await context.tracing.start({ screenshots: false, snapshots: false });
+	
+			page = await context.newPage();	
+	`,
     startFile: `const playwright = require('playwright-aws-lambda');
 	const path = require('path');
 	const readSendData = require('./rsData');
@@ -24,7 +65,7 @@ module.exports = {
 			browser = await playwright.launchChromium(false);
 			context = await browser.newContext({
 				recordHar: {
-					path: path.join(__dirname, '..', '..', 'tmp', 'example.har'),
+					path: path.join(__dirname, '..', '..', 'tmp', 'page.har'),
 					mode: 'full',
 					content: 'omit',
 				},
@@ -58,6 +99,25 @@ if (event.RequestType === 'Create' || event.RequestType === 'Delete') {
 	return await regularRun();
 }
 };`,
+    startFileLocallyDeviceSelection: `const playwright = require('playwright-aws-lambda');
+const { webkit, devices } = require('playwright');
+
+const errorStatusHandler = require('./statusError');
+
+const handlerLocally = async () => {
+	const mobileDevice = devices['NAME_OF_DEVICE'];
+
+	let context = null;
+	let err = null;
+	let page = null;
+	let browser = null;
+	try {	
+		browser = await webkit.launch({headless:true});
+		context = await browser.newContext({
+			...mobileDevice
+		});
+		page = await context.newPage();
+`,
     startFileLocally: `const playwright = require('playwright-aws-lambda');
 	const { chromium } = require('playwright-core');
 
diff --git a/package-lock.json b/package-lock.json
index b23c100..d9ca04d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,8 @@
             "devDependencies": {
                 "eslint": "^8.22.0",
                 "eslint-config-prettier": "^8.5.0",
-                "nodemon": "^2.0.19"
+                "nodemon": "^2.0.19",
+                "playwright": "^1.30.0"
             }
         },
         "node_modules/@ampproject/remapping": {
@@ -6002,6 +6003,22 @@
                 "node": ">=8"
             }
         },
+        "node_modules/playwright": {
+            "version": "1.30.0",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.30.0.tgz",
+            "integrity": "sha512-ENbW5o75HYB3YhnMTKJLTErIBExrSlX2ZZ1C/FzmHjUYIfxj/UnI+DWpQr992m+OQVSg0rCExAOlRwB+x+yyIg==",
+            "dev": true,
+            "hasInstallScript": true,
+            "dependencies": {
+                "playwright-core": "1.30.0"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/playwright-aws-lambda": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/playwright-aws-lambda/-/playwright-aws-lambda-0.9.0.tgz",
@@ -11767,6 +11784,15 @@
                 }
             }
         },
+        "playwright": {
+            "version": "1.30.0",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.30.0.tgz",
+            "integrity": "sha512-ENbW5o75HYB3YhnMTKJLTErIBExrSlX2ZZ1C/FzmHjUYIfxj/UnI+DWpQr992m+OQVSg0rCExAOlRwB+x+yyIg==",
+            "dev": true,
+            "requires": {
+                "playwright-core": "1.30.0"
+            }
+        },
         "playwright-aws-lambda": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/playwright-aws-lambda/-/playwright-aws-lambda-0.9.0.tgz",
diff --git a/package.json b/package.json
index 2211c55..76e67ba 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "devDependencies": {
         "eslint": "^8.22.0",
         "eslint-config-prettier": "^8.5.0",
-        "nodemon": "^2.0.19"
+        "nodemon": "^2.0.19",
+        "playwright": "^1.30.0"
     }
 }
diff --git a/service/lambdaFunction/index.js b/service/lambdaFunction/index.js
index 79cb542..2c42e72 100644
--- a/service/lambdaFunction/index.js
+++ b/service/lambdaFunction/index.js
@@ -2,6 +2,7 @@ const playwright = require('playwright-aws-lambda');
 const path = require('path');
 const readSendData = require('./rsData');
 const cfnResponse = require('cfn-response-async');
+const pageHandler = require('./handlerHar');
 
 const firstRun = async (event, context) => {
     await regularRun();
@@ -19,11 +20,12 @@ const regularRun = async () => {
     let context = null;
     let err = null;
     let page = null;
+    let browser;
     try {
         browser = await playwright.launchChromium(false);
         context = await browser.newContext({
             recordHar: {
-                path: path.join(__dirname, '..', '..', 'tmp', 'example.har'),
+                path: path.join(__dirname, '..', '..', 'tmp', 'page.har'),
                 mode: 'full',
                 content: 'omit',
             },
@@ -32,6 +34,7 @@ const regularRun = async () => {
 
         page = await context.newPage();
     } catch (error) {
+        console.log(error);
         err = error.message;
     } finally {
         if (browser) {
diff --git a/service/lambdaFunction/package-lock.json b/service/lambdaFunction/package-lock.json
index 1ad2ba7..4c9a887 100644
--- a/service/lambdaFunction/package-lock.json
+++ b/service/lambdaFunction/package-lock.json
@@ -20,6 +20,9 @@
                 "playwright-aws-lambda": "^0.9.0",
                 "playwright-core": "^1.30.0",
                 "playwright-har": "^0.1.1"
+            },
+            "devDependencies": {
+                "playwright": "^1.30.0"
             }
         },
         "node_modules/@menadevs/objectron": {
@@ -453,6 +456,22 @@
             "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
             "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
         },
+        "node_modules/playwright": {
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.31.1.tgz",
+            "integrity": "sha512-zKJabsIA2rvOwJ12lGTqWv4HVJzlfw2JtUvO4hAr7J8UXQZ1qEPpX20E1vcz/9fotnTkwgqp3CVdIBwptBN3Fg==",
+            "dev": true,
+            "hasInstallScript": true,
+            "dependencies": {
+                "playwright-core": "1.31.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/playwright-aws-lambda": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/playwright-aws-lambda/-/playwright-aws-lambda-0.9.0.tgz",
@@ -468,12 +487,12 @@
             }
         },
         "node_modules/playwright-chromium": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.30.0.tgz",
-            "integrity": "sha512-ZfqjYdFuxnZxK02mDZtHFK/Mi0+cjCVn51RmwLwLLHA8PkCExk0odmZH2REx+LjqX8tDLGnmf6vDnPAirdSY0g==",
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.31.1.tgz",
+            "integrity": "sha512-3XKJTnD8/uJLIdMVVG8VE22OrT7oOMaGoiL354ETXOGg8hTFcRYYpJYQ+86NIAhqEg9ogCOZqCn6CYWr28iMFw==",
             "hasInstallScript": true,
             "dependencies": {
-                "playwright-core": "1.30.0"
+                "playwright-core": "1.31.1"
             },
             "bin": {
                 "playwright": "cli.js"
@@ -483,9 +502,9 @@
             }
         },
         "node_modules/playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==",
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.31.1.tgz",
+            "integrity": "sha512-JTyX4kV3/LXsvpHkLzL2I36aCdml4zeE35x+G5aPc4bkLsiRiQshU5lWeVpHFAuC8xAcbI6FDcw/8z3q2xtJSQ==",
             "bin": {
                 "playwright": "cli.js"
             },
@@ -904,6 +923,15 @@
             "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
             "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
         },
+        "playwright": {
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.31.1.tgz",
+            "integrity": "sha512-zKJabsIA2rvOwJ12lGTqWv4HVJzlfw2JtUvO4hAr7J8UXQZ1qEPpX20E1vcz/9fotnTkwgqp3CVdIBwptBN3Fg==",
+            "dev": true,
+            "requires": {
+                "playwright-core": "1.31.1"
+            }
+        },
         "playwright-aws-lambda": {
             "version": "0.9.0",
             "resolved": "https://registry.npmjs.org/playwright-aws-lambda/-/playwright-aws-lambda-0.9.0.tgz",
@@ -913,17 +941,17 @@
             }
         },
         "playwright-chromium": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.30.0.tgz",
-            "integrity": "sha512-ZfqjYdFuxnZxK02mDZtHFK/Mi0+cjCVn51RmwLwLLHA8PkCExk0odmZH2REx+LjqX8tDLGnmf6vDnPAirdSY0g==",
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright-chromium/-/playwright-chromium-1.31.1.tgz",
+            "integrity": "sha512-3XKJTnD8/uJLIdMVVG8VE22OrT7oOMaGoiL354ETXOGg8hTFcRYYpJYQ+86NIAhqEg9ogCOZqCn6CYWr28iMFw==",
             "requires": {
-                "playwright-core": "1.30.0"
+                "playwright-core": "1.31.1"
             }
         },
         "playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g=="
+            "version": "1.31.1",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.31.1.tgz",
+            "integrity": "sha512-JTyX4kV3/LXsvpHkLzL2I36aCdml4zeE35x+G5aPc4bkLsiRiQshU5lWeVpHFAuC8xAcbI6FDcw/8z3q2xtJSQ=="
         },
         "playwright-har": {
             "version": "0.1.1",
diff --git a/service/lambdaFunction/package.json b/service/lambdaFunction/package.json
index 8c2c0cb..5d34ae6 100644
--- a/service/lambdaFunction/package.json
+++ b/service/lambdaFunction/package.json
@@ -28,5 +28,8 @@
         "playwright-aws-lambda": "^0.9.0",
         "playwright-core": "^1.30.0",
         "playwright-har": "^0.1.1"
+    },
+    "devDependencies": {
+        "playwright": "^1.30.0"
     }
 }
diff --git a/service/lambdaFunction/rsData.js b/service/lambdaFunction/rsData.js
index 74efbb0..dacefde 100644
--- a/service/lambdaFunction/rsData.js
+++ b/service/lambdaFunction/rsData.js
@@ -61,6 +61,7 @@ const readSendData = async (error = '') => {
             logger,
         );
         logger.log({
+            testDevice: process.env.TEST_DEVICE,
             totalDuration: totalDuration,
             statusTest: status,
             statusResult: error ? 0 : 1,
diff --git a/utils/constants.js b/utils/constants.js
index d5ac680..fa72317 100644
--- a/utils/constants.js
+++ b/utils/constants.js
@@ -6,4 +6,5 @@ module.exports = {
     BASIC_EXECUTION_ROLE_NAME: 'basic-execution-role',
     PUT_RULE_ROLE_NAME: 'put-rule-role',
     SEPARATOR: 'ToDisplay',
+    DESKTOP_DEVICE: 'Desktop Chrome',
 };
diff --git a/utils/lambda-creator.js b/utils/lambda-creator.js
index eca58bf..af1ae47 100644
--- a/utils/lambda-creator.js
+++ b/utils/lambda-creator.js
@@ -11,6 +11,7 @@ const { logger } = require('./logger');
 /**
  * Function Create and Assign proper roles to Lambda Function
  * @param  {string} functionName - Name of Lambda Function
+ * @param  {string} testDevice - Name Device where need to run a test
  * @param  {string} description - Description of Lambda Function
  * @param  {string} token - Shipping token from logzio
  * @param  {string} bucketName - AWS Bucket name
@@ -23,6 +24,7 @@ const { logger } = require('./logger');
 
 exports.createLambda = async (
     functionName,
+    testDevice,
     description,
     token,
     bucketName,
@@ -77,6 +79,7 @@ exports.createLambda = async (
                     TOKEN: token,
                     LISTENER_URL: listenerUrl,
                     REGION: region,
+                    TEST_DEVICE: testDevice,
                     NAME_FUNCTION: functionName,
                 },
             },
diff --git a/utils/update-function-local.js b/utils/update-function-local.js
index f285fdc..008a959 100644
--- a/utils/update-function-local.js
+++ b/utils/update-function-local.js
@@ -1,14 +1,35 @@
 const fs = require('fs');
 const path = require('path');
-const { startFileLocally, endFileLocally } = require('../helper/index-config');
+const { DESKTOP_DEVICE } = require('./constants');
+
+const {
+    startFileLocally,
+    endFileLocally,
+    startFileLocallyDeviceSelection,
+} = require('../helper/index-config');
 const { logger } = require('./logger');
+
+/**
+ * @param  {string} testDevice - Device where we need to run a test
+ */
+const populateDevice = (testDevice) => {
+    const valueForReplace = 'NAME_OF_DEVICE';
+
+    const startFileDevice = startFileLocallyDeviceSelection.replace(
+        valueForReplace,
+        testDevice,
+    );
+
+    return startFileDevice;
+};
+
 /**
  * @param  {string} code - Code snippet from ace editor inside Playwright test code
  * @param  {string} filePath
  */
-const readWriteAsync = async (code, filePath) => {
+const readWriteAsync = async (code, filePath, startFileForTest) => {
     try {
-        const fileStarts = startFileLocally.split('\n');
+        const fileStarts = startFileForTest.split('\n');
         const IDENTIFIER_CODE = `///////////////////////////////////`;
         const fileEnds = endFileLocally.split('\n');
         const extractCode = code.split(IDENTIFIER_CODE);
@@ -29,9 +50,9 @@ const readWriteAsync = async (code, filePath) => {
     }
 };
 /**
- * @param  {} code
+ * @param  {} code - Code snippet with user journey, built with end to end test Frameworks
  */
-exports.updateFileLocal = async (code) => {
+exports.updateFileLocal = async (code, testDevice) => {
     const statusError = {
         error: false,
         message: '',
@@ -45,7 +66,15 @@ exports.updateFileLocal = async (code) => {
     );
 
     try {
-        const fileStatus = await readWriteAsync(code, filePath);
+        let startFileForTest = startFileLocally;
+        if (testDevice != DESKTOP_DEVICE) {
+            startFileForTest = populateDevice(testDevice);
+        }
+        const fileStatus = await readWriteAsync(
+            code,
+            filePath,
+            startFileForTest,
+        );
         return fileStatus;
     } catch (err) {
         logger(err);
diff --git a/utils/update-function.js b/utils/update-function.js
index ef0fc4b..257bf71 100644
--- a/utils/update-function.js
+++ b/utils/update-function.js
@@ -1,14 +1,34 @@
 const fs = require('fs');
 const path = require('path');
 const logger = require('./logger');
-const { startFile, endFile } = require('../helper/index-config');
+const { DESKTOP_DEVICE } = require('./constants');
+const {
+    startFile,
+    endFile,
+    startFileDeviceSelection,
+} = require('../helper/index-config');
+
+/**
+ * @param  {string} testDevice - Device where we need to run a test
+ */
+const populateDevice = (testDevice) => {
+    const valueForReplace = 'NAME_OF_DEVICE';
+
+    const startFileDevice = startFileDeviceSelection.replace(
+        valueForReplace,
+        testDevice,
+    );
+
+    return startFileDevice;
+};
+
 /**
  * @param  {string} code - Code snippet from ace editor inside Playwright test code
  * @param  {string} filePath
  */
-const readWriteAsync = async (code, filePath) => {
+const readWriteAsync = async (code, filePath, startFileForLambda) => {
     try {
-        const fileStarts = startFile.split('\n');
+        const fileStarts = startFileForLambda.split('\n');
         const IDENTIFIER_CODE = `///////////////////////////////////`;
         const fileEnds = endFile.split('\n');
         const extractCode = code.split(IDENTIFIER_CODE);
@@ -29,9 +49,10 @@ const readWriteAsync = async (code, filePath) => {
     }
 };
 /**
- * @param  {} code
+ * @param  {string} code -
+ * @param  {string} testDevice - Device where we need to run a test
  */
-exports.updateFile = async (code) => {
+exports.updateFile = async (code, testDevice) => {
     const filePath = path.join(
         __dirname,
         '..',
@@ -41,7 +62,15 @@ exports.updateFile = async (code) => {
     );
 
     try {
-        const fileStatus = await readWriteAsync(code, filePath);
+        let startFileForLambda = startFile;
+        if (testDevice != DESKTOP_DEVICE) {
+            startFileForLambda = populateDevice(testDevice);
+        }
+        const fileStatus = await readWriteAsync(
+            code,
+            filePath,
+            startFileForLambda,
+        );
         if (fileStatus.error) {
             throw Error(fileStatus.err);
         }