diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 2beb2a6c6..4b9530788 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -106,3 +106,45 @@ jobs:
       with:
         name: Linux-Game
         path: Output/Linux.zip
+
+  # Mac
+  package-mac-editor:
+    name: Editor (Mac)
+    runs-on: "macos-latest"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Setup Vulkan
+      uses: ./.github/actions/vulkan
+    - name: Build
+      run: |
+        ./PackageEditor.command -arch=x64 -platform=Mac -deployOutput=Output
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Mac-Editor
+        path: Output/FlaxEditorMac.zip
+  package-mac-game:
+    name: Game (Mac)
+    runs-on: "macos-latest"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v2
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Setup Vulkan
+      uses: ./.github/actions/vulkan
+    - name: Build
+      run: |
+        ./PackagePlatforms.command -arch=x64 -platform=Mac -deployOutput=Output
+    - name: Upload
+      uses: actions/upload-artifact@v2
+      with:
+        name: Mac-Game
+        path: Output/Mac.zip
diff --git a/PackageEditor.command b/PackageEditor.command
new file mode 100644
index 000000000..7e88ad8de
--- /dev/null
+++ b/PackageEditor.command
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+
+set -e
+
+echo Building and packaging Flax Editor...
+
+# Change the path to the script root
+cd "`dirname "$0"`"
+
+# Run Flax.Build (also pass the arguments)
+bash ./Development/Scripts/Mac/CallBuildTool.sh --deploy --deployEditor --verbose --log --logFile="Cache/Intermediate/PackageLog.txt" "$@"