diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
index db8f85359..a4b0d44f7 100644
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -200,10 +200,18 @@ jobs:
           echo ::set-output name=rc_option::""
         fi
         echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" >> $GITHUB_ENV
+    - name: Set Certificate
+      run: |
+        New-Item -ItemType directory -Path certificate
+        Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_CERTIFICATE }}'
+        certutil -decode certificate\certificate.txt certificate\certificate.pfx
     - name: Configure and Build
       shell: bash
       run: |
         bash scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }} ${{steps.envs.outputs.rc_option}}
+    - name: Sign Portable content
+      run: |
+        .\scripts\Windows\resources\windows_sign_dlls.ps1 -pssw '${{ secrets.WIN_CERTIFICATE_PWD }}' -path 'src\install\'
     - name: Deploy
       shell: bash
       run: |
@@ -221,6 +229,9 @@ jobs:
       run: |
         mkdir src/installer
         mv src/install/MeshLab*-windows.exe  src/installer
+    - name: Sign Installer
+      run: |
+        .\scripts\Windows\resources\windows_sign_dlls.ps1 -pssw '${{ secrets.WIN_CERTIFICATE_PWD }}' -path 'src\installer\'
     - name: Uploading MeshLab Portable
       uses: actions/upload-artifact@v2
       with:
diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
index 7216a9c08..4d8d6e09f 100644
--- a/.github/workflows/Windows.yml
+++ b/.github/workflows/Windows.yml
@@ -28,18 +28,10 @@ jobs:
           echo  ::set-output name=artifact_suffix::""
         fi
         echo "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC" >> $GITHUB_ENV
-    - name: Set Certificate
-      run: |
-        New-Item -ItemType directory -Path certificate
-        Set-Content -Path certificate\certificate.txt -Value '${{ secrets.WIN_CERTIFICATE }}'
-        certutil -decode certificate\certificate.txt certificate\certificate.pfx
     - name: Configure and Build
       shell: bash
       run: |
         bash scripts/${{ runner.os }}/1_build.sh --${{ matrix.precision }} --nightly
-    - name: Sign Portable content
-      run: |
-        .\scripts\Windows\resources\windows_sign_dlls.ps1 -pssw '${{ secrets.WIN_CERTIFICATE_PWD }}' -path 'src\install\'
     - name: Deploy
       shell: bash
       run: |
@@ -57,9 +49,6 @@ jobs:
       run: |
         mkdir src/installer
         mv src/install/MeshLab*-windows.exe  src/installer/
-    - name: Sign Installer
-      run: |
-        .\scripts\Windows\resources\windows_sign_dlls.ps1 -pssw '${{ secrets.WIN_CERTIFICATE_PWD }}' -path 'src\installer\'
     - name: Uploading MeshLab Portable
       uses: actions/upload-artifact@v2
       with: