diff --git a/.ci/pack.sh b/.ci/pack.sh
index 30a2d9546..3d4ce9c9e 100755
--- a/.ci/pack.sh
+++ b/.ci/pack.sh
@@ -8,7 +8,7 @@ REV_NAME="azahar-$OS-$TARGET-$GITDATE-$GITREV"
 # Determine the name of the release being built.
 if [ "$GITHUB_REF_TYPE" = "tag" ]; then
     RELEASE_NAME=azahar-$GITHUB_REF_NAME
-    REV_NAME="azahar-$GITHUB_REF_NAME-$OS-$TARGET"
+    REV_NAME="azahar-$OS-$TARGET-$GITHUB_REF_NAME"
 else
     RELEASE_NAME=azahar-head
 fi
diff --git a/src/installer/citra.nsi b/src/installer/citra.nsi
index 99af76203..fe8f1a091 100644
--- a/src/installer/citra.nsi
+++ b/src/installer/citra.nsi
@@ -28,7 +28,7 @@ ManifestDPIAware true
 !define BINARY_SOURCE_DIR "..\..\build\bundle"
 
 Name "${PRODUCT_NAME}"
-OutFile "azahar-${PRODUCT_VERSION}-windows-${PRODUCT_VARIANT}-installer.exe"
+OutFile "azahar-windows-${PRODUCT_VARIANT}-${PRODUCT_VERSION}-installer.exe"
 SetCompressor /SOLID lzma
 ShowInstDetails show
 ShowUnInstDetails show