diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f1e1fb21e..24bb8085c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -77,10 +77,10 @@ jobs:
           - os: windows
             python-version: "3.10"
             conda-standalone: conda-standalone
-          # - os: windows
-          #   python-version: "3.11"
-          #   # conda-standalone: micromamba
-          #   conda-standalone: conda-standalone-nightly
+          - os: windows
+            python-version: "3.11"
+            # conda-standalone: micromamba
+            conda-standalone: conda-standalone-nightly
 
     env:
       PYTHONUNBUFFERED: "1"
@@ -118,9 +118,9 @@ jobs:
             conda activate constructor-dev
             echo "CONSTRUCTOR_CONDA_EXE=$CONDA_PREFIX/standalone_conda/conda.exe" >> $GITHUB_ENV
           fi
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
-        timeout-minutes: 60
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   timeout-minutes: 60
       - name: Run unit tests
         run: |
           pytest -vv --cov=constructor --cov-branch tests/ -m "not examples"
diff --git a/constructor/nsis/main.nsi.tmpl b/constructor/nsis/main.nsi.tmpl
index 80835b9af..a0c697104 100644
--- a/constructor/nsis/main.nsi.tmpl
+++ b/constructor/nsis/main.nsi.tmpl
@@ -1269,9 +1269,8 @@ SectionEnd
 !macroend
 
 Section "Uninstall"
-    System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_ROOT_PREFIX", "$INSTDIR")".r0'
-
     # Remove menu items, path entries
+    System::Call 'kernel32::SetEnvironmentVariable(t,t)i("CONDA_ROOT_PREFIX", "$INSTDIR")".r0'
     SetDetailsPrint both
     @UNINSTALL_MENUS@
 
diff --git a/constructor/winexe.py b/constructor/winexe.py
index ad8989f65..7ca1d4001 100644
--- a/constructor/winexe.py
+++ b/constructor/winexe.py
@@ -201,9 +201,15 @@ def setup_envs_commands(info, dir_path):
 
 def uninstall_menus_commands(info):
     tmpl = r"""
-        DetailPrint "Deleting menus from {name}..."
-        nsExec::ExecToLog '"$INSTDIR\_conda.exe" constructor --prefix "{path}" --rm-menus'
-    """
+        SetDetailsPrint
+        DetailPrint "Deleting @NAME@ menus in {name}..."
+        SetDetailsPrint listonly
+        push '"$INSTDIR\_conda.exe" constructor --prefix "{path}" --rm-menus'
+        push 'Failed to delete menus in {name}'
+        push 'WithLog'
+        call un.AbortRetryNSExecWait
+        SetDetailsPrint both
+        """
     lines = tmpl.format(name="base", path="$INSTDIR").splitlines()
     for env_name in info.get("_extra_envs_info", {}):
         path = join("$INSTDIR", "envs", env_name)