diff --git a/packages/goto/package.json b/packages/goto/package.json
index c533893b25..0a41ec6bc1 100644
--- a/packages/goto/package.json
+++ b/packages/goto/package.json
@@ -47,7 +47,8 @@
     "@browserless/test": "latest",
     "ava": "3",
     "browserless": "latest",
-    "exit-hook": "2"
+    "exit-hook": "2",
+    "fpscanner": "latest"
   },
   "engines": {
     "node": ">= 12"
diff --git a/packages/goto/src/evasions/index.js b/packages/goto/src/evasions/index.js
index 8b9ac02615..9749c99030 100644
--- a/packages/goto/src/evasions/index.js
+++ b/packages/goto/src/evasions/index.js
@@ -2,10 +2,12 @@
 
 module.exports = {
   chromeRuntime: require('./chrome-runtime'),
-  stackTraces: require('./stack-traces'),
   mediaCodecs: require('./media-codecs'),
   navigatorPermissions: require('./navigator-permissions'),
   navigatorPlugins: require('./navigator-plugins'),
+  navigatorVendor: require('./navigator-vendor'),
   randomizeUserAgent: require('./randomize-user-agent'),
-  webglVendor: require('./webgl-vendor')
+  stackTraces: require('./stack-traces'),
+  webglVendor: require('./webgl-vendor'),
+  windowFrame: require('./window-frame')
 }
diff --git a/packages/goto/src/evasions/navigator-vendor.js b/packages/goto/src/evasions/navigator-vendor.js
new file mode 100644
index 0000000000..0227f1bead
--- /dev/null
+++ b/packages/goto/src/evasions/navigator-vendor.js
@@ -0,0 +1,25 @@
+module.exports = page =>
+  page.evaluateOnNewDocument(async () => {
+    const getUserAgentVendor = userAgent => {
+      let vendor
+
+      if (userAgent.includes('Firefox')) {
+        vendor = 'firefox'
+      } else if (userAgent.includes('Chrome')) {
+        vendor = 'chrome'
+      } else {
+        vendor = 'safari'
+      }
+
+      return vendor
+    }
+
+    const userAgent = navigator.userAgent
+    const userAgentVendor = getUserAgentVendor(userAgent)
+
+    if (userAgentVendor === 'chrome') return
+
+    Object.defineProperty(navigator, 'vendor', {
+      value: userAgentVendor === 'safari' ? 'Apple Computer, Inc.' : ''
+    })
+  })
diff --git a/packages/goto/src/evasions/window-frame.js b/packages/goto/src/evasions/window-frame.js
new file mode 100644
index 0000000000..1ae767b29b
--- /dev/null
+++ b/packages/goto/src/evasions/window-frame.js
@@ -0,0 +1,9 @@
+'use strict'
+
+module.exports = page =>
+  page.evaluateOnNewDocument(() => {
+    if (window.outerWidth && window.outerHeight) return
+    const windowFrame = 85
+    window.outerWidth = window.innerWidth
+    window.outerHeight = window.innerHeight + windowFrame
+  })
diff --git a/packages/goto/test/e2e/evasions.js b/packages/goto/test/e2e/evasions.js
index 738a87237f..941ea511a1 100644
--- a/packages/goto/test/e2e/evasions.js
+++ b/packages/goto/test/e2e/evasions.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const fpscanner = require('fpscanner')
 const test = require('ava')
 
 const browserlessFactory = require('browserless')()
@@ -14,30 +15,54 @@ test.skip('arh.antoinevastel.com/bots/areyouheadless', async t => {
   t.true(content.includes('You are not Chrome headless'))
 })
 
-// See https://antoinevastel.com/bot%20detection/2018/11/13/fp-scanner-library-demo.html
-test('antoinevastel.com/bots/fpstructured', async t => {
-  const browserless = await browserlessFactory.createContext()
-  t.teardown(() => browserless.destroyContext())
-  const fpCollect = browserless.evaluate(page =>
-    page.evaluate(() => {
-      const fp = JSON.parse(document.getElementById('fp').innerText)
-      const scanner = JSON.parse(document.getElementById('scanner').innerText)
-      return { fp, scanner }
+test('fingerprintjs', async t => {
+  const getFingerprint = async userAgent => {
+    const browserless = await browserlessFactory.createContext()
+    const fingerprint = await browserless.evaluate(page =>
+      page.evaluate("document.querySelector('.giant').innerText")
+    )
+
+    const hash = await fingerprint('https://fingerprintjs.github.io/fingerprintjs/', {
+      headers: {
+        'user-agent': userAgent
+      }
     })
+
+    await browserless.destroyContext()
+    return hash
+  }
+
+  t.not(
+    await getFingerprint(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15'
+    ),
+    await getFingerprint(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Firefox/102.0'
+    )
   )
+})
 
-  const { scanner } = await fpCollect('https://antoinevastel.com/bots/fpstructured')
+test('fpscanner', async t => {
+  const waitForAssertion = async () => {
+    const browserless = await browserlessFactory.createContext()
+    const getFingerprint = browserless.evaluate(page =>
+      page.evaluate('fpCollect.generateFingerprint()')
+    )
 
-  // looks it isn't accurate,
-  // see https://github.com/antoinevastel/fpscanner/issues/9
-  const scannerProps = Object.keys(scanner).filter(key => key !== 'CHR_MEMORY')
+    const fingerprint = await getFingerprint('about:blank', {
+      scripts: ['https://unpkg.com/fpcollect']
+    })
 
-  const scannerDetections = Object.keys(scannerProps).filter(key => {
-    const value = scanner[key]
-    return value && value.consistent !== 3
-  })
+    await browserless.destroyContext()
+
+    const result = fpscanner.analyseFingerprint(fingerprint)
+    const failedChecks = Object.values(result).filter(val => val.consistent < 3)
+    // webdriver check is failing due to the outdated fp analyzer
+    return failedChecks.length < 2
+  }
 
-  t.is(scannerDetections.length, 0, scannerDetections.toString())
+  const results = await Promise.all([...Array(5).keys()].map(waitForAssertion))
+  t.true(results.some(value => value === true))
 })
 
 test('bot.sannysoft.com', async t => {
diff --git a/packages/goto/test/unit/evasions/index.js b/packages/goto/test/unit/evasions/index.js
index 4f2a71ff6b..eec6526531 100644
--- a/packages/goto/test/unit/evasions/index.js
+++ b/packages/goto/test/unit/evasions/index.js
@@ -10,6 +10,112 @@ const fileUrl = `file://${path.join(__dirname, '../../fixtures/dummy.html')}`
 
 const browserlessFactory = initBrowserless({ evasions: false })
 
+test('ensure `window.console` is present', async t => {
+  const browserless = await browserlessFactory.createContext()
+
+  t.teardown(() => browserless.destroyContext())
+
+  const page = await browserless.page()
+  const consoleKeys = () => page.evaluate('Object.keys(window.console)')
+
+  t.deepEqual(await consoleKeys(), [
+    'debug',
+    'error',
+    'info',
+    'log',
+    'warn',
+    'dir',
+    'dirxml',
+    'table',
+    'trace',
+    'group',
+    'groupCollapsed',
+    'groupEnd',
+    'clear',
+    'count',
+    'countReset',
+    'assert',
+    'profile',
+    'profileEnd',
+    'time',
+    'timeLog',
+    'timeEnd',
+    'timeStamp',
+    'context',
+    'memory'
+  ])
+})
+
+test('ensure `window.outerHeight` is present', async t => {
+  const browserless = await browserlessFactory.createContext()
+
+  t.teardown(() => browserless.destroyContext())
+
+  const page = await browserless.page()
+  const outerHeight = () => page.evaluate(() => window.outerHeight)
+
+  await evasions.windowFrame(page)
+  await page.goto(fileUrl)
+
+  t.true((await outerHeight()) > 0)
+})
+
+test('ensure `window.outerWidth` is present', async t => {
+  const browserless = await browserlessFactory.createContext()
+
+  t.teardown(() => browserless.destroyContext())
+
+  const page = await browserless.page()
+  const outerWidth = () => page.evaluate(() => window.outerWidth)
+
+  await evasions.windowFrame(page)
+  await page.goto(fileUrl)
+
+  t.true((await outerWidth()) > 0)
+})
+
+test('`navigator.vendor` is synchronized with user-agent', async t => {
+  const browserless = await browserlessFactory.createContext()
+
+  t.teardown(() => browserless.destroyContext())
+
+  const page = await browserless.page()
+
+  const navigatorVendor = () => page.evaluate('navigator.vendor')
+
+  t.is(await navigatorVendor(), 'Google Inc.')
+
+  await page.setUserAgent(
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15'
+  )
+
+  await evasions.navigatorVendor(page)
+  await page.goto(fileUrl)
+
+  t.is(await navigatorVendor(), 'Apple Computer, Inc.')
+
+  await page.setUserAgent(
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Firefox/102.0'
+  )
+
+  await page.goto(fileUrl)
+  t.is(await navigatorVendor(), '')
+})
+
+test('ensure `navigator.deviceMemory` is present', async t => {
+  const browserless = await browserlessFactory.createContext()
+
+  t.teardown(() => browserless.destroyContext())
+
+  const page = await browserless.page()
+
+  await page.goto(fileUrl)
+
+  const deviceMemory = () => page.evaluate('navigator.deviceMemory')
+
+  t.truthy(await deviceMemory())
+})
+
 test('randomize `user-agent`', async t => {
   const browserless = await browserlessFactory.createContext()
 
diff --git a/packages/screenshot/test/snapshots/pretty.js.md b/packages/screenshot/test/snapshots/pretty.js.md
index db35f584fd..3f89a8cc5d 100644
--- a/packages/screenshot/test/snapshots/pretty.js.md
+++ b/packages/screenshot/test/snapshots/pretty.js.md
@@ -163,7 +163,7 @@ Generated by [AVA](https://avajs.dev).
     	font-style: italic;␊
     }␊
     </style>␊
-    <style type="text/css">#screenshot code.language-js{font-family:"Roboto Mono"}</style><style type="text/css">#screenshot .token{color:#f81ce5}</style></head>␊
+    <style>#screenshot code.language-js{font-family:"Roboto Mono"}</style><style>#screenshot .token{color:#f81ce5}</style></head>␊
     <body id="screenshot">␊
       <pre class="language-js" tabindex="0"><code class="language-js"><span class="token punctuation">{</span>␊
       <span class="token string-property property">"version"</span><span class="token operator">:</span> <span class="token number">2</span><span class="token punctuation">,</span>␊
@@ -853,7 +853,7 @@ Generated by [AVA](https://avajs.dev).
     	font-style: italic;␊
     }␊
     </style>␊
-    <style type="text/css">#screenshot code.language-text{font-family:"Roboto Mono";color:#f81ce5}</style></head>␊
+    <style>#screenshot code.language-text{font-family:"Roboto Mono";color:#f81ce5}</style></head>␊
     <body id="screenshot">␊
       <pre class="language-text" tabindex="0"><code class="language-text">Open the network tab in devtools to see the response head…</code></pre>␊
       <script>/* PrismJS 1.28.0␊
@@ -1533,7 +1533,7 @@ Generated by [AVA](https://avajs.dev).
     	font-style: italic;␊
     }␊
     </style>␊
-    <style type="text/css">#screenshot code.language-text{font-family:"Roboto Mono";color:#f81ce5}</style></head>␊
+    <style>#screenshot code.language-text{font-family:"Roboto Mono";color:#f81ce5}</style></head>␊
     <body id="screenshot">␊
       <pre class="language-text" tabindex="0"><code class="language-text">Open the network tab in devtools to see the response head…</code></pre>␊
       <script>/* PrismJS 1.28.0␊
diff --git a/packages/screenshot/test/snapshots/pretty.js.snap b/packages/screenshot/test/snapshots/pretty.js.snap
index b4201c41ae..fd4345a777 100644
Binary files a/packages/screenshot/test/snapshots/pretty.js.snap and b/packages/screenshot/test/snapshots/pretty.js.snap differ