diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 5dba564753..c3d181b208 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -49,12 +49,7 @@ jobs:
         displayName: Customize config
 
       - script: make node_modules
-        displayName: Install dependencies
-
-      - base: |
-          rm -rf node_modules/win-ca/pem
-        displayName: Remove win-ca/pem
-        # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish
+        displayName: Install dependencies=
 
       - script: make build-npm
         displayName: Generate npm package
diff --git a/Makefile b/Makefile
index 8b2558e7f7..1a8baf0d37 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,8 @@ build: node_modules binaries/client
 	$(MAKE) build-extensions -B
 	yarn run compile
 ifeq "$(DETECTED_OS)" "Windows"
+# https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish
+	rm -rf node_modules/win-ca/pem
 	yarn run electron-builder --publish onTag --x64 --ia32
 else
 	yarn run electron-builder --publish onTag