diff --git a/.github/workflows/cortex-cpp-build.yml b/.github/workflows/cortex-cpp-build.yml
index a3023d18f..e3eb1653a 100644
--- a/.github/workflows/cortex-cpp-build.yml
+++ b/.github/workflows/cortex-cpp-build.yml
@@ -224,13 +224,19 @@ jobs:
           cd cortex-cpp
           make codesign CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}"
 
-      - name: Code Signing Windows
+      - uses: nick-fields/retry@v3
+        with:
+          continue_on_error: true
+          retry_wait_seconds: 10
+          timeout_minutes: 10
+          max_attempts: 3
+          shell: cmd
+          command: |
+            cd cortex-cpp
+            set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
+            make codesign CODE_SIGN=true AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
+        name: Code Signing Windows
         if: runner.os == 'Windows'
-        run: |
-          cd cortex-cpp
-          set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
-          make codesign CODE_SIGN=true AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
-
 
       - name: Package
         run: |
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 1101b5e9b..8b7e934f7 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -219,24 +219,25 @@ jobs:
           cd cortex-cpp
           make pre-package
 
-      # - name: Code Signing macOS
-      #   if: runner.os == 'macOS'
-      #   run: |
-      #     cd cortex-cpp
-      #     make codesign CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}"
-
-      # - uses: nick-fields/retry@v3
-      #   with:
-      #     continue_on_error: true
-      #     retry_wait_seconds: 10
-      #     timeout_minutes: 10
-      #     max_attempts: 3
-      #     command: |
-      #       cd cortex-cpp
-      #       set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
-      #       make codesign CODE_SIGN=true AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
-      #   name: Code Signing Windows
-      #   if: runner.os == 'Windows'
+      - name: Code Signing macOS
+        if: runner.os == 'macOS'
+        run: |
+          cd cortex-cpp
+          make codesign CODE_SIGN=true DEVELOPER_ID="${{ secrets.DEVELOPER_ID }}"
+
+      - uses: nick-fields/retry@v3
+        with:
+          continue_on_error: true
+          retry_wait_seconds: 10
+          timeout_minutes: 10
+          max_attempts: 3
+          shell: cmd
+          command: |
+            cd cortex-cpp
+            set PATH=%PATH%;%USERPROFILE%\.dotnet\tools
+            make codesign CODE_SIGN=true AZURE_KEY_VAULT_URI="${{ secrets.AZURE_KEY_VAULT_URI }}" AZURE_CLIENT_ID="${{ secrets.AZURE_CLIENT_ID }}" AZURE_TENANT_ID="${{ secrets.AZURE_TENANT_ID }}" AZURE_CLIENT_SECRET="${{ secrets.AZURE_CLIENT_SECRET }}" AZURE_CERT_NAME="${{ secrets.AZURE_CERT_NAME }}"
+        name: Code Signing Windows
+        if: runner.os == 'Windows'
 
       - name: Package
         run: |