diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a90fae7d..c3dce2f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,14 +24,15 @@ jobs:
             os: windows-latest
             aarch: amd64
             targets: exe
-            target: windows-x64
-            
-          # - platform: windows
+
+          # Flutter does not support x86
+          # - platform: windows 
           #   os: windows-latest
           #   aarch: 386
           #   targets: exe     
           #   target: windows-x86       
 
+          # Flutter does not support x86
           # - platform: linux
           #   os: ubuntu-latest
           #   aarch: 386
@@ -41,19 +42,13 @@ jobs:
             os: macos-11
             aarch: universal
             targets: dmg
-            target: macos-universal
+
 
           - platform: linux
             os: ubuntu-latest
             aarch: amd64
             targets: AppImage
-            target: linux-x64
 
-          # - platform: linux
-          #   os: ubuntu-latest
-          #   aarch: 386
-          #   targets: AppImage
-          #   target: linux-x86
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -118,11 +113,11 @@ jobs:
 
       - name: Get Libs ${{ matrix.platform }}
         run: |
-          make ${{ matrix.target }}-libs
+          make ${{ matrix.platform }}-libs
 
-      - name: Release ${{ matrix.target }}
+      - name: Release ${{ matrix.platform }}
         run: |          
-          make ${{ matrix.target }}-release
+          make ${{ matrix.platform }}-release
       
       - name: Copy to out WINDOWS 
         if: matrix.platform == 'windows'
@@ -132,10 +127,13 @@ jobs:
           foreach ($EXT in $EXT_ARRAY) {
               # Find all files with this extension in the current directory, and copy them to "out" directory
               Get-ChildItem -Recurse -File -Filter "*setup.$EXT" | Copy-Item -Destination "out" -ErrorAction SilentlyContinue
+              move out\*setup.$EXT out\${{ matrix.platform }}-x64-setup.$EXT
+              Get-ChildItem -Recurse -File -Filter "*.$EXT"
           }
-          mkdir ${{ matrix.target }}-portable
-          copy build/windows/runner/Release ${{ matrix.target }}-portable
-          Compress-Archive ${{ matrix.target }}-portable out\${{ matrix.target }}-portable.zip
+          
+          mkdir ${{ matrix.platform }}-portable
+          copy build/windows/runner/Release ${{ matrix.platform }}-portable
+          Compress-Archive ${{ matrix.platform }}-portable out\${{ matrix.platform }}-x64-portable.zip
           
       - name: Copy to out unix
         if: matrix.platform != 'windows'
@@ -148,6 +146,10 @@ jobs:
               # Find all files with this extension in SRC_DIR, and copy them to DST_DIR
               find "." -type f -name "*.$EXT" -exec cp {} "out" \;
           done
+          mv out/*arm64-v8a*.apk out/hiddify-android-arm64.apk
+          mv out/*armeabi-v7a*.apk out/hiddify-android-arm7.apk
+          mv out/*x86_64*.apk out/hiddify-android-x86_64.apk
+          mv out/*.AppImage out/hiddify-linux-x64.AppImage
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/Makefile b/Makefile
index edfa3d23..2c0cb8b5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,26 +16,26 @@ translate:
 android-release:
 	flutter build apk --target-platform android-arm,android-arm64,android-x64 --split-per-abi
 
-windows-x64-release:
+windows-release:
 	flutter_distributor package --platform windows --targets exe
 
-linux-x64-release:
+linux-release:
 	flutter_distributor package --platform linux --targets appimage
 
-macos-universal-release:
+macos-release:
 	flutter build macos --release &&\
 	tree ./build/macos/Build &&\
-    create-dmg  --app-drop-link 600 185 "hiddify-amd64.dmg" ./build/macos/Build/Products/Release/hiddify-clash.app
+    create-dmg  --app-drop-link 600 185 "hiddify-macos-universal.dmg" ./build/macos/Build/Products/Release/hiddify-clash.app
 
 android-libs: 
 	mkdir -p $(ANDROID_OUT)
 	curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-android.aar.gz | gunzip > $(ANDROID_OUT)/libcore.aar
 
-windows-x64-libs:
+windows-libs:
 	mkdir -p $(DESKTOP_OUT)
 	curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-windows-amd64.dll.gz | gunzip > $(DESKTOP_OUT)/libcore.dll
 
-linux-x64-libs:
+linux-libs:
 	mkdir -p $(DESKTOP_OUT)
 	curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-linux-amd64.so.gz | gunzip > $(DESKTOP_OUT)/libcore.so