diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 616522a8f..f57c24d38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +27,15 @@ build_windows_executable:
     - xcopy /q/h/e/s * %GOPATH%\src\github.com\DataDog\datadog-process-agent
     - cd %GOPATH%\src\github.com\DataDog\datadog-process-agent
   stage: binary_build
-  tags: ["runner:windows-agent6"]
+  tags: ["runner:windows-process-agent"]
   script:
     - cd %GOPATH%\src\github.com\DataDog\datadog-process-agent
-    - rake deps
-    - rake build
-#  after_script:
+    - call rake deps
+    - call rake build windres=true
+  after_script:
+    - copy %GOPATH%\src\github.com\DataDog\datadog-process-agent\process-agent.exe
 #    - '"C:\Program Files\Amazon\AWSCLI\aws.exe" s3 cp --profile ci-datadog-agent %S3_CP_OPTIONS% --recursive --exclude "*" --include "*.msi" .omnibus/pkg/ %S3_ARTEFACTS_URI%/'
   artifacts:
     expire_in: 2 weeks
     paths:
-      - ./datadog-process-agent.exe
+      - ./process-agent.exe
diff --git a/gorake.rb b/gorake.rb
index 68274e152..af9abf3c7 100644
--- a/gorake.rb
+++ b/gorake.rb
@@ -63,6 +63,10 @@ def go_build(program, opts={})
 
   end
   sh "#{cmd} -ldflags \"#{ldflags.join(' ')}\" #{program}"
+  if ENV['SIGN_WINDOWS'] then
+    signcmd = "signtool sign /v /t http://timestamp.verisign.com/scripts/timestamp.dll /fd SHA256 /sm /s \"My\" /sha1 ECCDAE36FDCB654D2CBAB3E8975AA55469F96E4C process-agent.exe"
+    sh signcmd
+  end
 end