diff --git a/build/Jaya.app/Contents/Info.plist b/build/Jaya.app/Contents/Info.plist
new file mode 100644
index 00000000..9b1a720b
--- /dev/null
+++ b/build/Jaya.app/Contents/Info.plist
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<plist version="1.0">
+<dict>
+
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+
+    <key>CFBundleIconFile</key>           
+    <string>Jaya</string>
+
+    <key>CFBundleName</key>
+    <string>Jaya</string>
+    
+    <key>CFBundleExecutable</key>
+    <string>Jaya.Ui</string>
+    
+    <key>CFBundleIdentifier</key>
+    <string>com.jaya.explorer</string>
+
+    <key>CFBundleVersion</key>
+    <string>1.0</string>
+    
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
+    
+    <key>LSMinimumSystemVersion</key>
+    <string>10.14</string>
+    
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright (c) 2020 Rubal Walia</string>
+
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFile</key>
+			<string>Jaya.icns</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/src/Jaya.app/Contents/Resources/Jaya.icns b/build/Jaya.app/Contents/Resources/Jaya.icns
similarity index 100%
rename from src/Jaya.app/Contents/Resources/Jaya.icns
rename to build/Jaya.app/Contents/Resources/Jaya.icns
diff --git a/build/build.cake b/build/build.cake
index 0647a75f..44f9b077 100644
--- a/build/build.cake
+++ b/build/build.cake
@@ -76,8 +76,8 @@ Task("BuildWindows64")
     };
     DotNetCorePublish(GetPath(_sourceDirectory), settings);
 
-    Information("Create archive 'windows.zip' from the build.");
-    Zip(outputDirectory, _outputDirectory + File("windows.zip"));
+    Information("Create portable ZIP archive from the build.");
+    Zip(outputDirectory, _outputDirectory + File("windows_portable.zip"));
 
     Information("Create installation setup.");
     var setupSettings = new InnoSetupSettings
@@ -99,7 +99,25 @@ Task("BuildMacOS64")
     .IsDependentOn("BuildInitialization")
     .Does(() => 
 {
-    Information("Executing MacOS (64-bit) build.");
+    var outputDirectory = _outputDirectory + Directory("osx");
+
+    Information("Build for MacOS (64-bit).");
+    var settings = new DotNetCorePublishSettings
+    {
+        Framework = "netcoreapp3.1",
+        Configuration = "Release",
+        SelfContained = true,
+        Runtime = "osx-x64",
+        OutputDirectory = GetPath(outputDirectory)
+    };
+    DotNetCorePublish(GetPath(_sourceDirectory), settings);
+
+    Information("Create portable ZIP archive from the build.");
+    Zip(outputDirectory, _outputDirectory + File("osx_portable.zip"));
+
+    Information("Create MacOS application bundle.");
+    CopyDirectory(_buildDirectory + Directory("Jaya.app"), _outputDirectory + Directory("Jaya.app"));
+    CopyDirectory(outputDirectory, _outputDirectory + Directory("Jaya.app/Contents/MacOS"));
 });
 
 Task("BuildLinux64")
@@ -107,7 +125,21 @@ Task("BuildLinux64")
     .IsDependentOn("BuildInitialization")
     .Does(() => 
 {
-    Information("Executing Linux (64-bit) build.");
+    var outputDirectory = _outputDirectory + Directory("osx");
+
+    Information("Build for Linux (64-bit).");
+    var settings = new DotNetCorePublishSettings
+    {
+        Framework = "netcoreapp3.1",
+        Configuration = "Release",
+        SelfContained = true,
+        Runtime = "linux-x64",
+        OutputDirectory = GetPath(outputDirectory)
+    };
+    DotNetCorePublish(GetPath(_sourceDirectory), settings);
+
+    Information("Create portable ZIP archive from the build.");
+    Zip(outputDirectory, _outputDirectory + File("linux_portable.zip"));
 });
 
 Task("Deploy")
diff --git a/src/Jaya.app/Contents/Info.plist b/src/Jaya.app/Contents/Info.plist
deleted file mode 100755
index 54513371..00000000
--- a/src/Jaya.app/Contents/Info.plist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
-<plist version="1.0"><dict><key>CFBundlePackageType</key><string>APPL</string><key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
-
-    <key>CFBundleIconFile</key>           <string>Jaya</string>
-
-    <key>CFBundleName</key>               <string>Jaya</string>
-    <key>CFBundleExecutable</key>         <string>Jaya.Ui</string>
-    <key>CFBundleIdentifier</key>         <string>com.jaya.explorer</string>
-
-    <key>CFBundleVersion</key>            <string>1.0</string>
-    <key>CFBundleShortVersionString</key> <string>1.0</string>
-
-    <key>NSHighResolutionCapable</key>    <string>True</string>
-    <key>LSMinimumSystemVersion</key>     <string>10.14</string>
-    <key>NSHumanReadableCopyright</key>   <string>Copyright (c) 2019 Rubal Walia</string>
-
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeIconFile</key>
-			<string>Jaya.icns</string>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-		</dict>
-	</array>
-</dict></plist>
diff --git a/src/dist.mac.ps1 b/src/dist.mac.ps1
deleted file mode 100644
index 322e6e27..00000000
--- a/src/dist.mac.ps1
+++ /dev/null
@@ -1,10 +0,0 @@
-Set-Location ./Jaya.app/Contents
-if (-not (Test-Path ./MacOS)) {
-    New-Item MacOS -ItemType Directory | Out-Null
-}
-Set-Location ./MacOS
-Remove-Item *
-Set-Location ../../../
-Set-Location ./Jaya.Ui
-dotnet publish -r osx.10.14-x64 -o ../Jaya.app/Contents/MacOS -p:PublishSingleFile=true
-Set-Location ..