diff --git a/.pipelines/pipeline.user.windows.buddy.yml b/.pipelines/pipeline.user.windows.buddy.yml
new file mode 100644
index 0000000..9c6818a
--- /dev/null
+++ b/.pipelines/pipeline.user.windows.buddy.yml
@@ -0,0 +1,8 @@
+static_analysis_options:
+  policheck_options:
+    disable_tool_scan: false
+    fail_on_error: true
+    scan_comments: true
+  binskim_options:
+    disable_tool_scan: false
+    fail_on_error: true
diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml
index 36957a6..ccb87aa 100644
--- a/.pipelines/pipeline.user.windows.yml
+++ b/.pipelines/pipeline.user.windows.yml
@@ -5,7 +5,7 @@ environment:
     version: 2019
   runtime:
     provider: appcontainer
-    image: 'cdpxwinrs5.azurecr.io/global/vse2019:latest'
+    image: 'cdpxwin1809.azurecr.io/global/vse2019:latest'
     source_mode: map
 
 version: