diff --git a/OnlyOffice/ONLYOFFICE.download.recipe b/OnlyOffice/ONLYOFFICE.download.recipe
index 486e3c7..7d4d797 100644
--- a/OnlyOffice/ONLYOFFICE.download.recipe
+++ b/OnlyOffice/ONLYOFFICE.download.recipe
@@ -42,25 +42,23 @@
 			<string>EndOfCheckPhase</string>
 		</dict>
 		<dict>
-            <key>Processor</key>
-            <string>Unarchiver</string>
-            <key>Arguments</key>
-            <dict>
-                <key>archive_format</key>
-                <string>zip</string>
-                <key>archive_path</key>
-                <string>%pathname%</string>
-                <key>destination_path</key>
-                <string>%RECIPE_CACHE_DIR%/%NAME%</string>
-                <key>purge_destination</key>
-                <true/>
-            </dict>
-        </dict>
+			<key>Arguments</key>
+			<dict>
+				<key>archive_path</key>
+				<string>%pathname%</string>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>Unarchiver</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>input_path</key>
-				<string>%RECIPE_CACHE_DIR%/%NAME%//ONLYOFFICE.app</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/ONLYOFFICE.app</string>
 				<key>requirement</key>
 				<string>anchor apple generic and identifier "asc.onlyoffice.ONLYOFFICE" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "2WH24U26GJ")</string>
 			</dict>
diff --git a/OnlyOffice/ONLYOFFICE.install.recipe b/OnlyOffice/ONLYOFFICE.install.recipe
index b5917c7..1e1cb69 100644
--- a/OnlyOffice/ONLYOFFICE.install.recipe
+++ b/OnlyOffice/ONLYOFFICE.install.recipe
@@ -23,7 +23,18 @@
 			<key>Arguments</key>
 			<dict>
 				<key>dmg_path</key>
-				<string>%pathname%</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
+				<key>dmg_root</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+			</dict>
+			<key>Processor</key>
+			<string>DmgCreator</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>dmg_path</key>
+				<string>%dmg_path%</string>
 				<key>items_to_copy</key>
 				<array>
 					<dict>
diff --git a/OnlyOffice/ONLYOFFICE.munki.recipe b/OnlyOffice/ONLYOFFICE.munki.recipe
index 4aba93e..813ce16 100644
--- a/OnlyOffice/ONLYOFFICE.munki.recipe
+++ b/OnlyOffice/ONLYOFFICE.munki.recipe
@@ -38,11 +38,22 @@
 	<string>com.github.solutiogruppen.download.ONLYOFFICE</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>dmg_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
+				<key>dmg_root</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+			</dict>
+			<key>Processor</key>
+			<string>DmgCreator</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>pkg_path</key>
-				<string>%pathname%</string>
+				<string>%dmg_path%</string>
 				<key>repo_subdirectory</key>
 				<string>%MUNKI_REPO_SUBDIR%</string>
 			</dict>
diff --git a/OnlyOffice/ONLYOFFICE.pkg.recipe b/OnlyOffice/ONLYOFFICE.pkg.recipe
index 71fa9d7..944549a 100644
--- a/OnlyOffice/ONLYOFFICE.pkg.recipe
+++ b/OnlyOffice/ONLYOFFICE.pkg.recipe
@@ -22,6 +22,11 @@
 	<key>Process</key>
 	<array>
 		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>app_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/ONLYOFFICE.app</string>
+			</dict>
 			<key>Processor</key>
 			<string>AppPkgCreator</string>
 		</dict>