diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml
index c65c0a81..8b8479c9 100644
--- a/.gitlab-ci-files/windows-desktop.yml
+++ b/.gitlab-ci-files/windows-desktop.yml
@@ -9,7 +9,7 @@
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null
     - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null
   variables:
-    CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DLINPHONE_WINDOWS_SIGN_TOOL=$WINDOWS_SIGN_TOOL -DLINPHONE_WINDOWS_SIGN_TIMESTAMP_URL=$WINDOWS_SIGN_TIMESTAMP_URL -DLINPHONE_WINDOWS_SIGN_HASH=$WINDOWS_SIGN_HASH -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
+    CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
     LINPHONESDK_PLATFORM: Desktop
     OUTPUT_ZIP_FOLDER: win64
     MINGW_TYPE: mingw64
@@ -93,7 +93,7 @@
   tags: [ "windows-powershell-vs-17-2022" ]
 
 .windows-codesigning:
-  extends: .windows-vs
+  extends: .prepare
   tags: [ "windows-powershell-vs-17-2022-apps" ]
 
 .windows-msbuild-variables:
@@ -183,7 +183,7 @@ win64-ninja-vs2022-scheduled-windows:
     - if: $PACKAGE_WINDOWS
     - if: $DEPLOY_WINDOWS
   variables:
-    CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_WINDOWS_SIGN_TOOL=$WINDOWS_SIGN_TOOL -DLINPHONE_WINDOWS_SIGN_TIMESTAMP_URL=$WINDOWS_SIGN_TIMESTAMP_URL -DLINPHONE_WINDOWS_SIGN_HASH=$WINDOWS_SIGN_HASH -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
+    CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
     RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$WINDOWS_PLATFORM/$APP_FOLDER
 
 win64-ninja-vs2022-package-windows:
@@ -192,10 +192,29 @@ win64-ninja-vs2022-package-windows:
     CMAKE_ARCHITECTURE: ""
     PARALLEL_OPTIONS: ""
   extends:
-    - .windows-codesigning
+    - .windows-vs2022
     - .windows-ninja-variables
     - .vs-win64-package
 
+#################################################
+#               SIGNING
+#################################################
+
+win64-codesigning:
+  stage: signing
+  extends:
+    - .windows-codesigning
+  needs:
+    - win64-ninja-vs2022-package-windows
+  rules:
+    - !reference [.rules-merge-request-manual, rules]
+    - if: $NIGHTLY_MASTER
+    - if: $PACKAGE_WINDOWS
+    - if: $DEPLOY_WINDOWS
+  script:
+    - cd build-desktop/OUTPUT/Packages/
+    - ${WINDOWS_SIGN_TOOL} sign /fd SHA256 /t ${WINDOWS_SIGN_TIMESTAMP_URL} /sha1 ${WINDOWS_SIGN_HASH} *.exe
+
 #################################################
 #               DEPLOY
 #################################################
@@ -216,7 +235,7 @@ win64-ninja-vs2022-upload:
   extends:
     - .win64-upload
   needs:
-    - win64-ninja-vs2022-package-windows
+    - win64-codesigning
 
 .win64-plugins-upload:
   stage: deploy