diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 936d1dd90..1317e5002 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,7 +30,7 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.15'
+    vmImage: 'macOS-latest'
   strategy:
     matrix:
       node_12_x:
@@ -54,7 +54,7 @@ jobs:
 
 - job: Windows
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   strategy:
     matrix:
       node_12_x:
diff --git a/binding.gyp b/binding.gyp
index b2c262dbf..66411ec3f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,4 +1,23 @@
 {
+  'target_defaults': {
+    'conditions': [
+      ['OS=="win"', {
+        'msvs_settings': {
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [
+                '/Qspectre',
+                '/guard:cf'
+              ]
+            },
+            'VCLinkerTool': {
+              'AdditionalOptions': [
+                '/guard:cf'
+              ]
+            }
+          },
+      }],
+    ],
+  },
   'conditions': [
     ['OS=="win"', {
       'targets': [
@@ -13,7 +32,7 @@
           ],
           'libraries': [
             'shlwapi.lib'
-          ]
+          ],
         },
         {
           'target_name': 'conpty_console_list',
@@ -22,7 +41,7 @@
           ],
           'sources' : [
             'src/win/conpty_console_list.cc'
-          ]
+          ],
         },
         {
           'target_name': 'pty',