diff --git a/conanfile.py b/conanfile.py
index 111d4f9b9c..e9d3ba6742 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -311,7 +311,7 @@ class CuraConan(ConanFile):
         self._generate_cura_version(Path(self.source_folder, "cura"))
 
         if self.options.devtools:
-            entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements"))
+            entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "MacOs", "cura.entitlements"))
             self._generate_pyinstaller_spec(location = self.generators_folder,
                                             entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
                                             icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
@@ -437,7 +437,7 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
 
         self._generate_cura_version(Path(self._site_packages, "cura"))
 
-        entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements"))
+        entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOs", "cura.entitlements"))
         self._generate_pyinstaller_spec(location = self._base_dir,
                                         entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data()["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
                                         icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
diff --git a/packaging/MacOs/build_macos.py b/packaging/MacOs/build_macos.py
index e87ac3dff3..ca1448c8a1 100644
--- a/packaging/MacOs/build_macos.py
+++ b/packaging/MacOs/build_macos.py
@@ -20,12 +20,13 @@ def build_dmg(source_path: str, dist_path: str, filename: str) -> None:
                  "--icon-size", "90",
                  "--icon", "UltiMaker-Cura.app", "169", "272",
                  "--eula", f"{source_path}/packaging/cura_license.txt",
-                 "--background", f"{source_path}/packaging/dmg/cura_background_dmg.png",
+                 "--background", f"{source_path}/packaging/MacOs/cura_background_dmg.png",
                  f"{dist_path}/{filename}",
                  f"{dist_path}/UltiMaker-Cura.app"]
 
     subprocess.run(arguments)
 
+
 def build_pkg(source_path: str, dist_path: str, app_filename: str, component_filename: str, installer_filename: str) -> None:
     pkg_build_executable = os.environ.get("PKG_BUILD_EXECUTABLE", "pkgbuild")
     product_build_executable = os.environ.get("PRODUCT_BUILD_EXECUTABLE", "productbuild")
@@ -65,6 +66,7 @@ def build_pkg(source_path: str, dist_path: str, app_filename: str, component_fil
     print(f"installer_creation_arguments: {installer_creation_arguments}")
     subprocess.run(installer_creation_arguments)
 
+
 def code_sign(dist_path: str, filename: str) -> None:
     """ Sign a file using apple codesign. This uses a different certificate to package signing."""
     codesign_executable = os.environ.get("CODESIGN", "codesign")