diff --git a/dashboard/src/components/marketplace/AppListingStepsDialog.vue b/dashboard/src/components/marketplace/AppListingStepsDialog.vue
index 4ce29044e0b..0c791151edc 100644
--- a/dashboard/src/components/marketplace/AppListingStepsDialog.vue
+++ b/dashboard/src/components/marketplace/AppListingStepsDialog.vue
@@ -7,7 +7,7 @@
 		}"
 	>
 		<template #body-content>
-			<div v-if="appDoc.doc.review_stage === 'Ready for Review'">
+			<div v-if="appDoc.doc.status === 'In Review'">
 				<p class="text-p-base text-gray-700">
 					Your app is sent for review to our team. Please wait for the review to
 					be completed.
@@ -15,7 +15,7 @@
 			</div>
 			<ObjectList v-else :options="listOptions" />
 		</template>
-		<template #actions v-if="appDoc.doc.review_stage !== 'Ready for Review'">
+		<template #actions v-if="appDoc.doc.status !== 'In Review'">
 			<Button
 				class="w-full"
 				variant="solid"
diff --git a/dashboard/src/components/marketplace/CodeReview.vue b/dashboard/src/components/marketplace/CodeReview.vue
deleted file mode 100644
index d648fd85d8d..00000000000
--- a/dashboard/src/components/marketplace/CodeReview.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: 'Code Review',
-			size: '6xl',
-		}"
-	>
-		<template v-if="getResults" #body-content>
-			<div class="container mx-auto px-4">
-				<div class="grid gap-3">
-					<div class="flex items-center mb-2">
-						<div class="flex items-center">
-							<span class="text-lg font-medium text-gray-700 mr-2"
-								>Status:</span
-							>
-							<Badge
-								:variant="'subtle'"
-								size="lg"
-								:label="$resources.codeScreening.doc.status"
-								:theme="getBadgeTheme"
-							/>
-						</div>
-						<!-- <Button
-							iconLeft="check"
-							v-if="
-								isSystemUser && $resources.codeScreening.doc.status == 'Open'
-							"
-							:variant="'subtle'"
-							theme="gray"
-							size="sm"
-							class="mr-4 ml-auto"
-							@click="approveRelease"
-						>
-							Approve Release
-						</Button>
-						<Button
-							iconLeft="x"
-							v-if="
-								isSystemUser && $resources.codeScreening.doc.status == 'Open'
-							"
-							:variant="'subtle'"
-							theme="gray"
-							size="sm"
-							class="mr-4"
-							@click="showRejectReleaseDialog = true"
-						>
-							Reject Release
-						</Button> -->
-					</div>
-					<Dialog
-						v-model="showRejectReleaseDialog"
-						:options="{
-							title: 'Confirm',
-							size: 'xl',
-							actions: [
-								{
-									label: 'Reject Release',
-									variant: 'solid',
-									onClick: rejectRelease,
-								},
-							],
-						}"
-					>
-						<template #body-content>
-							<FormControl
-								:type="'textarea'"
-								size="sm"
-								variant="subtle"
-								placeholder="Enter your reasons for rejection"
-								:disabled="false"
-								v-model="rejectionReason"
-							/>
-						</template>
-					</Dialog>
-
-					<div
-						class="card bg-white shadow-md rounded-md overflow-hidden"
-						v-for="file in getResults"
-						:key="file.name"
-					>
-						<div class="card-header bg-gray-200 p-3">
-							<h2 class="text-md font-semibold text-gray-800">
-								{{ file.name }} - {{ file.score }} issues
-							</h2>
-						</div>
-						<div class="p-4">
-							<div
-								class="issues space-y-4"
-								v-for="line in file.lines"
-								:key="line.context.line_number"
-							>
-								<div
-									class="issue-item p-4 mb-4"
-									v-for="issue in line.issues"
-									:key="issue.violation"
-								>
-									<div class="flex items-center mb-3">
-										<span class="text-red-600 mr-2">{{ issue.severity }}</span>
-										<span class="text-gray-800">({{ issue.violation }})</span>
-										<span class="text-orange-500 font-semibold pl-2">
-											- {{ issue.match }}</span
-										>
-									</div>
-									<div class="border border-gray-400 p-2 rounded-md">
-										<div
-											style="background-color: #d1f8d9"
-											class="border rounded-md"
-										>
-											<div
-												v-for="(lineText, i) in line.context.lines"
-												:key="i"
-												:class="{
-													'bg-yellow-200 border rounded-md':
-														lineText.includes(issue.match) &&
-														line.context.line_range[i] ===
-															line.context.line_number,
-												}"
-											>
-												<code class="p-2 text-sm whitespace-pre-wrap">
-													<span>{{ line.context.line_range[i] }}:</span>
-													{{ lineText }}
-												</code>
-											</div>
-										</div>
-										<div
-											v-if="
-												getCommentsForLine(file.name, line.context.line_number)
-													.length
-											"
-										>
-											<hr class="h-2 mt-2" />
-											<div
-												class="comment-item mt-2 p-2"
-												v-for="comment in getCommentsForLine(
-													file.name,
-													line.context.line_number,
-												)"
-												:key="comment.name"
-											>
-												<div class="flex items-center">
-													<Avatar
-														:shape="'circle'"
-														:image="null"
-														:label="comment.commented_by"
-														size="md"
-													/>
-
-													<strong class="text-gray-900 pl-2 pr-2 text-lg">
-														{{ comment.commented_by }}
-													</strong>
-													<Tooltip
-														:text="formatTime(comment.time)"
-														:placement="'top'"
-													>
-														<span class="text-gray-600 text-sm">
-															{{ $dayjs(comment.time).fromNow() }}
-														</span>
-													</Tooltip>
-												</div>
-												<p class="text-gray-800 text-base p-2 ml-6">
-													{{ comment.comment }}
-												</p>
-											</div>
-										</div>
-										<hr class="h-2 mt-2" />
-										<NewComment
-											v-if="$resources.codeScreening.doc.status == 'Open'"
-											:approval_request_name="row.approval_request_name"
-											:filename="file.name"
-											:line_number="line.context.line_number"
-											@comment-submitted="handleCommentSubmitted"
-										/>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-
-<script>
-import NewComment from './NewComment.vue';
-import { toast } from 'vue-sonner';
-
-export default {
-	components: {
-		NewComment,
-	},
-	props: ['row', 'app', 'isSystemUser'],
-	data() {
-		return {
-			show: true,
-			showRejectReleaseDialog: false,
-			rejectionReason: '',
-		};
-	},
-	computed: {
-		getResults() {
-			if (this.$resources.codeScreening.doc) {
-				const results = JSON.parse(this.$resources.codeScreening.doc.result);
-				return results;
-			}
-		},
-		getComments() {
-			if (this.$resources.codeScreening.doc) {
-				const results = this.$resources.codeScreening.doc.code_comments;
-				return results;
-			}
-		},
-		getBadgeTheme() {
-			const status = this.$resources.codeScreening.doc.status.toLowerCase();
-			if (status === 'open') {
-				return 'blue';
-			} else if (status === 'approved') {
-				return 'green';
-			} else {
-				return 'red';
-			}
-		},
-	},
-	methods: {
-		getCommentsForLine(filename, lineNumber) {
-			// Filter comments by matching filename and line number
-			let filteredComments = this.getComments.filter(
-				(comment) =>
-					comment.filename === filename && comment.line_number === lineNumber,
-			);
-
-			// Sort comments by time in descending order (latest first)
-			filteredComments.sort((a, b) => new Date(a.time) - new Date(b.time));
-
-			return filteredComments;
-		},
-		formatTime(time) {
-			const date = new Date(time);
-			return date.toLocaleString('en-US', {
-				year: 'numeric',
-				month: 'short',
-				day: 'numeric',
-				hour: '2-digit',
-				minute: '2-digit',
-				second: '2-digit',
-				hour12: true,
-			});
-		},
-		handleCommentSubmitted() {
-			// DB write takes sometime. Instant reload wont be able to reflect changes so quickly. Ideally the cache should be updadted client side
-			setTimeout(() => {
-				this.$resources.codeScreening.reload();
-			}, 1200);
-		},
-		approveRelease() {
-			this.$resources.codeScreening.setValue.submit({
-				status: 'Approved',
-				reviewed_by: this.$team?.doc?.user,
-			});
-		},
-		rejectRelease() {
-			// Check if the rejection reason is empty
-			if (!this.rejectionReason) {
-				toast.error('Reason for rejection is mandatory');
-				return;
-			}
-			// Proceed with the rejection if the reason is provided
-			this.$resources.codeScreening.setValue.submit({
-				status: 'Rejected',
-				reason_for_rejection: this.rejectionReason,
-				reviewed_by: this.$team?.doc?.user,
-			});
-			this.showRejectReleaseDialog = false;
-		},
-	},
-	resources: {
-		codeScreening() {
-			return {
-				type: 'document',
-				doctype: 'App Release Approval Request',
-				name: this.row.approval_request_name,
-				fields: [
-					'name',
-					'marketplace_app',
-					'screening_status',
-					'app_release',
-					'status',
-					'result',
-					'code_comments',
-				],
-				auto: true,
-			};
-		},
-	},
-};
-</script>
diff --git a/dashboard/src/components/marketplace/NewComment.vue b/dashboard/src/components/marketplace/NewComment.vue
deleted file mode 100644
index 9384c5f455f..00000000000
--- a/dashboard/src/components/marketplace/NewComment.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-	<div v-if="show" class="p-2">
-		<FormControl
-			:type="'textarea'"
-			size="sm"
-			variant="subtle"
-			placeholder="Enter your comments here"
-			:disabled="false"
-			label="Comment"
-			v-model="newComment"
-		/>
-		<div class="flex justify-end mt-2">
-			<Button
-				:variant="'solid'"
-				theme="gray"
-				size="sm"
-				@click="submitComment"
-				:disabled="!newComment.trim()"
-			>
-				Comment
-			</Button>
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	props: ['approval_request_name', 'filename', 'line_number'],
-	data() {
-		return {
-			show: true,
-			newComment: '',
-		};
-	},
-	methods: {
-		submitComment() {
-			const commentData = {
-				name: this.approval_request_name,
-				filename: this.filename,
-				line_number: this.line_number,
-				comment: this.newComment,
-			};
-			this.$resources.addComment.submit(commentData);
-			this.newComment = '';
-			this.$emit('comment-submitted');
-		},
-	},
-	resources: {
-		addComment() {
-			return {
-				url: 'press.api.marketplace.add_code_review_comment',
-				method: 'POST',
-			};
-		},
-	},
-};
-</script>
diff --git a/dashboard/src/objects/marketplace.js b/dashboard/src/objects/marketplace.js
index 3b234cd0f96..41455176b71 100644
--- a/dashboard/src/objects/marketplace.js
+++ b/dashboard/src/objects/marketplace.js
@@ -4,7 +4,6 @@ import { toast } from 'vue-sonner';
 import ChangeAppBranchDialog from '../components/marketplace/ChangeAppBranchDialog.vue';
 import { confirmDialog, icon, renderDialog } from '../utils/components';
 import PlansDialog from '../components/marketplace/PlansDialog.vue';
-import CodeReview from '../components/marketplace/CodeReview.vue';
 import GenericDialog from '../components/GenericDialog.vue';
 import ObjectList from '../components/ObjectList.vue';
 import { userCurrency, currency } from '../utils/format';
@@ -581,27 +580,21 @@ function showReleases(row, app) {
 									align: 'center',
 								},
 								{
-									label: 'Code Screening',
+									label: 'Audit',
 									type: 'Component',
 									width: 0.15,
 									align: 'center',
-									component: ({ row, listResource: releases, app }) => {
-										if (
-											(row.status === 'Awaiting Approval' ||
-												row.status === 'Rejected') &&
-											row.screening_status === 'Complete'
-										) {
-											return h(Button, {
-												label: 'Code Review',
-												variant: 'subtle',
-												theme: 'blue',
-												size: 'sm',
-												onClick: () =>
-													codeReview(row, app, window.is_system_user),
-											});
-										}
+									component: ({ row }) => {
+										const theme = {
+											Pass: 'green',
+											'Needs Improvement': 'orange',
+											Warn: 'orange',
+											Fail: 'red',
+											Inconclusive: 'gray',
+										};
 										return h(Badge, {
-											label: row.screening_status || 'Not Started',
+											label: row.audit_result || 'Pending',
+											theme: theme[row.audit_result] || 'gray',
 										});
 									},
 								},
@@ -682,13 +675,3 @@ function showReleases(row, app) {
 		),
 	);
 }
-
-function codeReview(row, app, isSystemUser) {
-	renderDialog(
-		h(CodeReview, {
-			row: row,
-			app: app,
-			isSystemUser: isSystemUser,
-		}),
-	);
-}
diff --git a/press/api/marketplace.py b/press/api/marketplace.py
index 57ceba5840d..3a416b0d935 100644
--- a/press/api/marketplace.py
+++ b/press/api/marketplace.py
@@ -1370,26 +1370,3 @@ def get_marketplace_apps() -> list[dict]:
 		apps = frappe.get_all("Marketplace App", {"status": "Published"}, ["name", "title", "route"])
 		frappe.cache().set_value("marketplace_apps", apps, expires_in_sec=60 * 60 * 24 * 7)
 	return apps
-
-
-@protected("App Source")
-@frappe.whitelist()
-def add_code_review_comment(name: str, filename: str, line_number: int, comment: str):
-	try:
-		doc = frappe.get_doc("App Release Approval Request", name)
-		# Add a new comment
-		doc.append(
-			"code_comments",
-			{
-				"filename": filename,
-				"line_number": line_number,
-				"comment": comment,
-				"commented_by": frappe.session.user,
-				"time": frappe.utils.now_datetime(),
-			},
-		)
-
-		doc.save()
-		return {"status": "success", "message": "Comment added successfully."}
-	except Exception as e:
-		frappe.throw(f"Unable to add comment. Something went wrong: {e!s}")
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/__init__.py b/press/marketplace/doctype/app_release_approval_code_comments/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json b/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
deleted file mode 100644
index 9cee24bc2bd..00000000000
--- a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2024-08-20 14:44:43.708918",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "filename",
-  "line_number",
-  "comment",
-  "time",
-  "commented_by"
- ],
- "fields": [
-  {
-   "fieldname": "filename",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "File Name",
-   "reqd": 1
-  },
-  {
-   "fieldname": "line_number",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Line Number",
-   "reqd": 1
-  },
-  {
-   "fieldname": "time",
-   "fieldtype": "Datetime",
-   "in_list_view": 1,
-   "label": "Datetime",
-   "reqd": 1
-  },
-  {
-   "fieldname": "commented_by",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Commented By",
-   "options": "User",
-   "reqd": 1
-  },
-  {
-   "fieldname": "comment",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Comment",
-   "reqd": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2024-08-22 23:00:39.858129",
- "modified_by": "Administrator",
- "module": "Marketplace",
- "name": "App Release Approval Code Comments",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": []
-}
\ No newline at end of file
diff --git a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py b/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py
deleted file mode 100644
index d1390e66c15..00000000000
--- a/press/marketplace/doctype/app_release_approval_code_comments/app_release_approval_code_comments.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2024, Frappe and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class AppReleaseApprovalCodeComments(Document):
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		comment: DF.SmallText
-		commented_by: DF.Link
-		filename: DF.SmallText
-		line_number: DF.Int
-		parent: DF.Data
-		parentfield: DF.Data
-		parenttype: DF.Data
-		time: DF.Datetime
-	# end: auto-generated types
-	pass
diff --git a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
index 2a366a01370..6c6381d5c02 100644
--- a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
+++ b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.js
@@ -16,6 +16,19 @@ frappe.ui.form.on('Marketplace App Audit', {
 			frappe.show_alert({ message: __('Audit re-queued'), indicator: 'blue' });
 			frm.reload_doc();
 		});
+
+		if (
+			frm.doc.status === 'Completed' &&
+			['Fail', 'Warn', 'Needs Improvement'].includes(frm.doc.audit_result)
+		) {
+			frm.add_custom_button(__('Send Report to Publisher'), async () => {
+				await frm.call('send_report_to_publisher');
+				frappe.show_alert({
+					message: __('Report sent to publisher'),
+					indicator: 'green',
+				});
+			});
+		}
 	},
 });
 
diff --git a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
index 6bbb50783e9..2b46ea4b18e 100644
--- a/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
+++ b/press/marketplace/doctype/marketplace_app_audit/marketplace_app_audit.py
@@ -1,6 +1,7 @@
 # Copyright (c) 2026, Frappe and contributors
 # For license information, please see license.txt
 
+import json
 from dataclasses import asdict, dataclass
 
 import frappe
@@ -130,6 +131,7 @@ def run_audit(self):
 		finally:
 			self.finished_at = frappe.utils.now_datetime()
 			self.save()
+			self._handle_audit_outcome()
 
 	@frappe.whitelist()
 	def rerun_audit(self):
@@ -266,3 +268,103 @@ def _build_summary(self, tally: dict) -> str:
 				lines.append(f"  {severity}: {s['Fail']} failed, {s['Warn']} warnings")
 
 		return "\n".join(lines)
+
+	def _handle_audit_outcome(self):
+		"""
+		This method will ensure that some action is taken on the audit outcome.
+		"""
+		# first check if enable audit action is enabled in Marketplace settings
+		if not frappe.db.get_single_value("Marketplace Settings", "enable_audit_actions"):
+			return
+
+		if self.audit_result == "Fail":
+			# mark "attention required" status in marketplace app
+			frappe.db.set_value("Marketplace App", self.marketplace_app, "status", "Attention Required")
+			self._yank_release()
+			self._auto_reject_approval_requests()
+
+	def _yank_release(self) -> None:
+		"""
+		Yanks the release to prevent deployment on benches.
+		Creating a yanked app release record will automatically mark the release as yanked in it's after insert hook.
+		"""
+		release = frappe.get_doc("App Release", self.app_release)
+		if release.status in ("Draft", "Approved"):
+			frappe.get_doc(
+				doctype="Yanked App Release",
+				hash=release.hash,
+				parent_app_release=release.name,
+				team=release.team,
+			).insert()
+
+	def _auto_reject_approval_requests(self) -> None:
+		"""
+		Auto rejects all open approval requests for the release.
+		"""
+		open_approval_requests = frappe.get_all(
+			"App Release Approval Request",
+			filters={"app_release": self.app_release, "status": "Open"},
+			pluck="name",
+		)
+		if not open_approval_requests:
+			return
+
+		for approval_request in open_approval_requests:
+			request = frappe.get_doc("App Release Approval Request", approval_request)
+			request.status = "Rejected"
+			request.reason_for_rejection = (
+				f"Automated audit failed.\n\n"
+				f"Result: {str(self.audit_result).strip()}\n"
+				f"Summary: {str(self.audit_summary).strip()}\n\n"
+				f"Please review the audit results and fix the issues pointed."
+			)
+			request.save()
+
+	@frappe.whitelist()
+	def send_report_to_publisher(self):
+		"""Email the app publisher a structured audit report with all failing checks."""
+		marketplace_app_team, marketplace_app_title = frappe.db.get_value(
+			"Marketplace App", self.marketplace_app, ["team", "title"]
+		)
+		publisher_email = frappe.db.get_value("Team", marketplace_app_team, "user")
+
+		cc = []
+		if frappe.db.get_single_value("Marketplace Settings", "send_report_to_reviewer"):
+			reviewer_email = frappe.db.get_value("User", frappe.session.user, "email")
+			cc = [reviewer_email]
+
+		failing_checks = []
+		for check in self.audit_checks:
+			if check.result in ("Fail", "Warn"):
+				details_parsed = None
+				if check.details:
+					try:
+						details_parsed = json.loads(check.details)
+					except (json.JSONDecodeError, TypeError):
+						details_parsed = None
+
+				failing_checks.append(
+					{
+						"severity": check.severity,
+						"check_name": check.check_name,
+						"category": check.category,
+						"result": check.result,
+						"message": check.message,
+						"details": details_parsed,
+						"remediation": check.remediation,
+					}
+				)
+
+		frappe.sendmail(
+			recipients=[publisher_email],
+			cc=cc,
+			subject=f"Marketplace Audit Report: {marketplace_app_title}",
+			args={
+				"app_title": marketplace_app_title,
+				"audit_result": self.audit_result,
+				"audit_summary": self.audit_summary,
+				"failing_checks": failing_checks,
+			},
+			template="marketplace_audit_report",
+		)
+		frappe.msgprint(f"Audit report sent to {publisher_email}")
diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
index 4f09805e2f6..e7892f2db46 100644
--- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
+++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json
@@ -6,6 +6,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "general_section",
+  "enable_audit_actions",
+  "column_break_wvgs",
+  "send_report_to_reviewer",
   "featured_apps_section",
   "featured_apps",
   "release_auto_approval_section",
@@ -40,12 +44,35 @@
    "fieldtype": "Table",
    "label": "Auto Release Teams",
    "options": "Auto Release Team"
+  },
+  {
+   "fieldname": "general_section",
+   "fieldtype": "Section Break",
+   "label": "Audit Settings"
+  },
+  {
+   "default": "0",
+   "description": "Feature flag which gives power to the Marketplace Auditor to take actions based on audit results.",
+   "fieldname": "enable_audit_actions",
+   "fieldtype": "Check",
+   "label": "Enable Audit Actions"
+  },
+  {
+   "fieldname": "column_break_wvgs",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "description": "Adds reviewer to CC while sending the report.",
+   "fieldname": "send_report_to_reviewer",
+   "fieldtype": "Check",
+   "label": "Send report to reviewer"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-08-20 20:10:09.572230",
+ "modified": "2026-04-17 11:13:01.764809",
  "modified_by": "Administrator",
  "module": "Marketplace",
  "name": "Marketplace Settings",
diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.py b/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
index 6e838d53e53..ca8c7c29b89 100644
--- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
+++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.py
@@ -6,4 +6,22 @@
 
 
 class MarketplaceSettings(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from press.marketplace.doctype.auto_release_team.auto_release_team import AutoReleaseTeam
+		from press.marketplace.doctype.featured_app.featured_app import FeaturedApp
+
+		auto_release_apps: DF.Table[FeaturedApp]
+		auto_release_teams: DF.Table[AutoReleaseTeam]
+		enable_audit_actions: DF.Check
+		featured_apps: DF.Table[FeaturedApp]
+		send_report_to_reviewer: DF.Check
+	# end: auto-generated types
+
 	pass
diff --git a/press/marketplace/patches/cleanup_code_screening_data.py b/press/marketplace/patches/cleanup_code_screening_data.py
new file mode 100644
index 00000000000..e9824e8dd09
--- /dev/null
+++ b/press/marketplace/patches/cleanup_code_screening_data.py
@@ -0,0 +1,35 @@
+import frappe
+
+
+def execute():
+	"""
+	Clean up Code Screening data before bench migrate drops the columns.
+	- Null out screening fields on App Release Approval Request
+	- Null out review_stage on Marketplace App
+	- Delete orphaned App Release Approval Code Comments rows
+	(the child DocType is removed; bench trim-tables will drop the table later)
+	"""
+	screening_fields = [
+		"screening_status",
+		"baseline_request",
+		"baseline_result",
+		"baseline_requirements",
+		"result",
+		"result_html",
+		"result_html_rendered",
+		"requirements",
+	]
+
+	for field in screening_fields:
+		if frappe.db.has_column("App Release Approval Request", field):
+			frappe.db.sql(
+				f"UPDATE `tabApp Release Approval Request` SET `{field}` = NULL WHERE `{field}` IS NOT NULL"
+			)
+
+	if frappe.db.has_column("Marketplace App", "review_stage"):
+		frappe.db.sql(
+			"UPDATE `tabMarketplace App` SET `review_stage` = NULL WHERE `review_stage` IS NOT NULL"
+		)
+
+	if frappe.db.table_exists("tabApp Release Approval Code Comments"):
+		frappe.db.sql("DELETE FROM `tabApp Release Approval Code Comments`")
diff --git a/press/patches.txt b/press/patches.txt
index d4d1482869a..ce6b75850f9 100644
--- a/press/patches.txt
+++ b/press/patches.txt
@@ -160,4 +160,5 @@ press.press.doctype.proxy_server.patches.set_use_as_proxy_for_agent_and_metrics_
 press.patches.v0_0_1.cancel_pending_version_upgrades_for_disabled_bench_groups
 press.partner.doctype.partner_lead.patches.merge_engagement_stage_to_status
 press.patches.v0_0_1.add_job_status_index_press_job_step
-press.patches.v0_8_0.set_suspended_at_for_suspended_sites
\ No newline at end of file
+press.patches.v0_8_0.set_suspended_at_for_suspended_sites
+press.marketplace.patches.cleanup_code_screening_data
diff --git a/press/press/doctype/app_release/app_release.py b/press/press/doctype/app_release/app_release.py
index 2ae1e23706a..2c61d0ed3f4 100644
--- a/press/press/doctype/app_release/app_release.py
+++ b/press/press/doctype/app_release/app_release.py
@@ -72,30 +72,28 @@ class AppRelease(Document):
 	def get_list_query(query, filters=None, **list_args):
 		app_release = frappe.qb.DocType("App Release")
 		release_approve_request = frappe.qb.DocType("App Release Approval Request")
+		marketplace_app_audit = frappe.qb.DocType("Marketplace App Audit")
 
-		# Subquery to get the latest screening_status for each app_release
-		latest_approval_request = (
+		approval_request_name = (
 			frappe.qb.from_(release_approve_request)
-			.select(release_approve_request.screening_status)
+			.select(release_approve_request.name)
 			.where(release_approve_request.app_release == app_release.name)
 			.orderby(release_approve_request.creation, order=frappe.qb.terms.Order.desc)
 			.limit(1)
 		)
 
-		# Subquery to get the latest name for each app_release
-		approval_request_name = (
-			frappe.qb.from_(release_approve_request)
-			.select(release_approve_request.name)
-			.where(release_approve_request.app_release == app_release.name)
-			.orderby(release_approve_request.creation, order=frappe.qb.terms.Order.desc)
+		latest_audit_result = (
+			frappe.qb.from_(marketplace_app_audit)
+			.select(marketplace_app_audit.audit_result)
+			.where(marketplace_app_audit.app_release == app_release.name)
+			.orderby(marketplace_app_audit.creation, order=frappe.qb.terms.Order.desc)
 			.limit(1)
 		)
 
-		# Main query that selects app_release fields and the latest screening_status and name
 		query = query.select(
 			app_release.name,
-			latest_approval_request.as_("screening_status"),
 			approval_request_name.as_("approval_request_name"),
+			latest_audit_result.as_("audit_result"),
 		)
 
 		return query  # noqa
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.html b/press/press/doctype/app_release_approval_request/app_release_approval_request.html
deleted file mode 100644
index 2339e427342..00000000000
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-{{ styles }}
-<style>
-    td .linenodiv {
-        background-color: #f0f0f0;
-        padding-right: 10px;
-    }
-
-    .highlight {
-        margin-left: 2rem;
-        background: #f8f8f8;
-    }
-
-    .issues {
-        padding-bottom: 1rem;
-        padding-top: 1rem;
-        padding-left: 2rem;
-    }
-</style>
-<div class="accordian" id="result_accordian">
-    {% for file in result %}
-    <div class="card">
-        <div class="card-header" id="heading_{{ file.id }}">
-            <button class="btn btn-link collapsed" data-toggle="collapse" data-parent="#result_accordian"
-                data-target="#collapse_{{ file.id }}">{{ file.name }} - {{ file.score }} issues</button>
-        </div>
-        <div id="collapse_{{ file.id }}" class="collapse" data-parent="#result_accordian">
-            <div class="card-body">
-                {% for line in file.lines %}
-                <div class="issues">
-                    {%for issue in line.issues %}
-                    <div>
-                        <strong>{{ issue.severity }}</strong> - <span>{{ issue.violation }}</span> -
-                        <code>{{ issue.match }}</code>
-                    </div>
-                    {% endfor %}
-                </div>
-                <div class="highlight">{{ line.highlighted_context }}</div>
-                {% endfor %}
-            </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.js b/press/press/doctype/app_release_approval_request/app_release_approval_request.js
index a540782a7f5..2af62df130b 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.js
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.js
@@ -9,18 +9,6 @@ frappe.ui.form.on('App Release Approval Request', {
 				frm.save();
 			});
 		}
-
-		if (!frm.doc.result && frm.doc.screening_status === 'Not Started') {
-			let btn = frm.add_custom_button('Screen Release', () => {
-				frm.call('start_screening');
-				frappe.msgprint('Started Screening');
-			});
-		}
-
-		if (frm.doc.result_html) {
-			let wrapper = frm.get_field('result_html_rendered').$wrapper;
-			wrapper.html(frm.doc.result_html);
-		}
 	},
 	status(frm) {
 		frm.set_value('reviewed_by', frappe.session.user);
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.json b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
index 9c1e170d6de..2ce62b26a3c 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.json
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.json
@@ -13,20 +13,7 @@
   "app",
   "reviewed_by",
   "section_break_8",
-  "reason_for_rejection",
-  "code_screening_tab",
-  "screening_status",
-  "baseline_result_section",
-  "baseline_request",
-  "baseline_result",
-  "baseline_requirements",
-  "result_section",
-  "result",
-  "result_html",
-  "result_html_rendered",
-  "requirements",
-  "comments_tab",
-  "code_comments"
+  "reason_for_rejection"
  ],
  "fields": [
   {
@@ -93,83 +80,11 @@
    "fieldtype": "Link",
    "label": "Reviewed By",
    "options": "User"
-  },
-  {
-   "fieldname": "result",
-   "fieldtype": "Code",
-   "label": "Result",
-   "read_only": 1
-  },
-  {
-   "fieldname": "result_html",
-   "fieldtype": "Code",
-   "label": "Result Html",
-   "read_only": 1
-  },
-  {
-   "fieldname": "code_screening_tab",
-   "fieldtype": "Tab Break",
-   "label": "Code Screening"
-  },
-  {
-   "fieldname": "baseline_result_section",
-   "fieldtype": "Section Break",
-   "label": "Baseline Result"
-  },
-  {
-   "fieldname": "baseline_result",
-   "fieldtype": "Code",
-   "label": "Baseline Result",
-   "read_only": 1
-  },
-  {
-   "fieldname": "baseline_requirements",
-   "fieldtype": "Code",
-   "label": "Baseline Requirements",
-   "read_only": 1
-  },
-  {
-   "fieldname": "result_section",
-   "fieldtype": "Section Break",
-   "label": "Result"
-  },
-  {
-   "fieldname": "result_html_rendered",
-   "fieldtype": "HTML",
-   "label": "Result HTML Rendered"
-  },
-  {
-   "fieldname": "requirements",
-   "fieldtype": "Code",
-   "label": "Requirements"
-  },
-  {
-   "fieldname": "baseline_request",
-   "fieldtype": "Data",
-   "label": "Baseline Request"
-  },
-  {
-   "default": "Not Started",
-   "fieldname": "screening_status",
-   "fieldtype": "Select",
-   "label": "Screening Status",
-   "options": "Not Started\nScreening\nComplete"
-  },
-  {
-   "fieldname": "comments_tab",
-   "fieldtype": "Tab Break",
-   "label": "Comments"
-  },
-  {
-   "fieldname": "code_comments",
-   "fieldtype": "Table",
-   "label": "Code Comments",
-   "options": "App Release Approval Code Comments"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-08-22 22:42:15.984891",
+ "modified": "2026-04-09 17:39:08.003050",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "App Release Approval Request",
diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.py b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
index 3f7f3875ebc..95f0197f76f 100644
--- a/press/press/doctype/app_release_approval_request/app_release_approval_request.py
+++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.py
@@ -1,16 +1,9 @@
 # Copyright (c) 2021, Frappe and contributors
 # For license information, please see license.txt
 
-import glob
-import json
-import re
-
 import frappe
 from frappe.model.document import Document
 from frappe.model.naming import make_autoname
-from pygments import highlight
-from pygments.formatters import HtmlFormatter as HF
-from pygments.lexers import PythonLexer as PL
 
 
 class AppReleaseApprovalRequest(Document):
@@ -22,24 +15,11 @@ class AppReleaseApprovalRequest(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		from press.marketplace.doctype.app_release_approval_code_comments.app_release_approval_code_comments import (
-			AppReleaseApprovalCodeComments,
-		)
-		from press.press.doctype.app_release.app_release import AppRelease
-
 		app: DF.Link | None
 		app_release: DF.Link
-		baseline_request: DF.Data | None
-		baseline_requirements: DF.Code | None
-		baseline_result: DF.Code | None
-		code_comments: DF.Table[AppReleaseApprovalCodeComments]
 		marketplace_app: DF.Link
 		reason_for_rejection: DF.TextEditor | None
-		requirements: DF.Code | None
-		result: DF.Code | None
-		result_html: DF.Code | None
 		reviewed_by: DF.Link | None
-		screening_status: DF.Literal["Not Started", "Screening", "Complete"]
 		status: DF.Literal["Open", "Cancelled", "Approved", "Rejected"]
 		team: DF.Link | None
 	# end: auto-generated types
@@ -47,11 +27,8 @@ class AppReleaseApprovalRequest(Document):
 	dashboard_fields = [  # noqa: RUF012
 		"name",
 		"marketplace_app",
-		"screening_status",
 		"app_release",
 		"status",
-		"result",
-		"code_comments",
 	]
 
 	def before_save(self):
@@ -85,6 +62,7 @@ def validate(self):
 	def before_insert(self):
 		self.request_already_exists()
 		self.another_request_awaiting_approval()
+		self.check_release_not_yanked()
 		self.update_release_status()
 
 	def request_already_exists(self):
@@ -194,208 +172,12 @@ def validate_audit_for_approval(self):
 				f"Summary: {audit.audit_summary or 'N/A'}"
 			)
 
-	@frappe.whitelist()
-	def start_screening(self):
-		self.release = frappe.get_doc("App Release", self.app_release, for_update=True)
-		self._set_baseline()
-
-		# Clone the release, if not already
-		self.release._clone()
-
-		self._screen_python_files()
-		self._filter_results()
-		self._render_html()
-
-		self.screening_status = "Complete"
-		self.save()
-
-	def _set_baseline(self):
-		approved_releases = frappe.get_all(
-			"App Release Approval Request",
-			fields=["name", "result", "requirements"],
-			filters={"status": "Approved", "app": self.app, "name": ("!=", self.name)},
-			order_by="creation desc",
-			limit=1,
-		)
-
-		if approved_releases:
-			baseline = approved_releases[0]
-			self.baseline_request = baseline.name
-			self.baseline_result = baseline.result
-			self.baseline_requirements = baseline.requirements
-
-	def _screen_python_files(self):
-		files = glob.glob(self.release.clone_directory + "/**/*.py", recursive=True)
-		result = []
-		for file in files:
-			lines = self._screen_python_file(file)
-			if lines:
-				name = file.replace(self.release.clone_directory, "", 1)[1:]
-				f = {
-					"name": name,
-					"lines": lines,
-					"score": len(lines),
-				}
-				result.append(f)
-		result = sorted(result, key=lambda x: x["score"], reverse=True)
-		self.result = json.dumps(result, indent=2)
-
-	def _screen_python_file(self, filename):
-		def is_commented_line(line):
-			stripped_line = line.strip()
-			return stripped_line.startswith("#")
-
-		with open(filename, "r") as ff:
-			lines = ff.read().splitlines()
-		lines_with_issues = []
-		for index, line in enumerate(lines):
-			if is_commented_line(line):
-				continue
-			issues = []
-			configuration = get_configuration()
-			for severity, violations in configuration.items():
-				for violation, keywords in violations.items():
-					pattern = r"(?:^|\W)({})(?:\W|$)".format("|".join(keywords))
-					regex = re.compile(pattern)
-					search = regex.search(line)
-					if search:
-						issues.append(
-							{
-								"severity": severity,
-								"violation": violation,
-								"match": search.group(1),
-							}
-						)
-			if issues:
-				context = get_context(lines, index)
-				lines_with_issues.append({"issues": issues, "context": context})
-		return lines_with_issues
-
-	def _filter_results(self):
-		result = json.loads(self.result)
-		if self.baseline_request and self.baseline_result:
-			baseline_result = json.loads(self.baseline_result)
-			diff_result = []
-			for file in result:
-				if file not in baseline_result:
-					diff_result.append(file)
-		else:
-			diff_result = result
-		self.diff_result = json.dumps(diff_result, indent=2)
-
-	def _render_html(self):
-		diff_result = json.loads(self.diff_result)
-		formatter = HF()
-		styles = f"<style>{formatter.get_style_defs()}</style>"
-		for file in diff_result:
-			file["id"] = file["name"].replace("/", "_").replace(".", "_")
-			for line in file["lines"]:
-				line["highlighted_context"] = highlight_context(line["context"])
-		html = frappe.render_template(
-			"press/press/doctype/app_release_approval_request/app_release_approval_request.html",
-			{"result": diff_result, "styles": styles},
-		)
-		self.result_html = html
-		self.result_html_rendered = html
-
-
-def get_context(lines, index, size=2):
-	length = len(lines)
-	start = max(0, index - size)
-	end = min(index + size, length)
-	lines = lines[start : end + 1]
-	return {
-		"line_number": index + 1,
-		"line_range": list(range(start + 1, end + 2)),
-		"lines": lines,
-	}
-
-
-def highlight_context(context):
-	line_number = context["line_number"]
-	line_range = context["line_range"]
-	lines = context["lines"]
-	code = "\n".join(lines)
-	formatter = HF(
-		linenos="table",
-		linenostart=line_range[0],
-		hl_lines=[line_number - line_range[0] + 1],
-	)
-	lexer = PL(stripnl=False, tabsize=4)
-	highlighted = highlight(code, lexer, formatter)
-	return highlighted  # noqa: RET504
-
-
-def get_configuration():
-	return {
-		"Critical": {
-			"Arbitrary Command Injection": ["os", "sys", "subprocess", "sysconfig"],
-			"Arbitrary Command Injection - Frappe": ["popen", "execute_in_shell"],
-			"Arbitrary Code Execution": [
-				"exec",
-				"eval",
-				"safe_eval",
-				"safe_exec",
-				"compile",
-				"codeop",
-			],
-			"Runtime Imports": [
-				"__import__",
-				"importlib",
-				"zipimport",
-				"runpy",
-				"pkgutil",
-				"modulefinder",
-			],
-			"Runtime Imports - Frappe": ["get_attr", "get_module"],
-			"Unsafe Serialization": ["pickle", "marshal"],
-			"Template Rendering": ["jinja", "jinja2"],
-			"Foreign Functions Library": ["ctypes"],
-			"Arbitrary Code Injection - Posix": [
-				"signal",
-				"syslog",
-				"pipes",
-				"fcntl",
-				"pty",
-				"tty",
-				"posix",
-				"pwd",
-				"grp",
-				"spwd",
-			],
-		},
-		"Major": {
-			"File Manipulation": [
-				"open",
-				"io",
-				"shutil",
-				"pathlib",
-				"fileinput",
-				"sqlite3",
-				"gzip",
-				"bz2",
-				"lzma",
-				"zipfile",
-			],
-			"File Manipulation - Frappe": ["touch_file", "get_file_json", "read_file"],
-			"Site Access": ["get_site_config", "get_sites"],
-		},
-		"Moderate": {
-			"Potential Screening Bypass": [
-				"globals",
-				"builtins",
-				"__globals__",
-				"__builtins__",
-				"__module__",
-				"__file__",
-				"__func__",
-				"__class__",
-				"__dict__",
-				"__self__",
-			],
-		},
-		"Low": {
-			"Debugging": ["inspect", "breakpoint"],
-			"Multiprocessing": ["multiprocessing", "threading"],
-		},
-	}
+	def check_release_not_yanked(self):
+		"""
+		Prevent approval requests for releases that failed audit and were yanked.
+		"""
+		release_status = frappe.db.get_value("App Release", self.app_release, "status")
+		if release_status == "Yanked":
+			frappe.throw(
+				"Cannot create a approval request for a yanked release. This release was yanked due to audit failure. Please fix the issues and publish a new release."
+			)
diff --git a/press/press/doctype/marketplace_app/events.py b/press/press/doctype/marketplace_app/events.py
index a87a06cd910..84f719b4568 100644
--- a/press/press/doctype/marketplace_app/events.py
+++ b/press/press/doctype/marketplace_app/events.py
@@ -11,7 +11,6 @@ def auto_review_for_missing_steps():
 		"Marketplace App",
 		{
 			"status": ("in", ["Draft", "Attention Required", "In Review"]),
-			"stop_auto_review": False,
 		},
 		pluck="name",
 	):
diff --git a/press/press/doctype/marketplace_app/marketplace_app.json b/press/press/doctype/marketplace_app/marketplace_app.json
index bd351cf9fd5..f95bcf57f26 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.json
+++ b/press/press/doctype/marketplace_app/marketplace_app.json
@@ -59,9 +59,6 @@
   "after_uninstall_script",
   "review_tab",
   "status",
-  "column_break_bcjk",
-  "stop_auto_review",
-  "review_stage",
   "dashboard_tab",
   "onboarding_related_section",
   "show_for_site_creation",
@@ -330,26 +327,12 @@
    "fieldtype": "Tab Break",
    "label": "Review"
   },
-  {
-   "default": "Not Started",
-   "fieldname": "review_stage",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Review Stage",
-   "options": "Not Started\nDescription Missing\nLogo Missing\nApp Release Not Reviewed\nReady for Review\nReady to Publish\nRejected"
-  },
   {
    "default": "0",
    "fieldname": "frappe_approved",
    "fieldtype": "Check",
    "label": "Frappe Approved"
   },
-  {
-   "default": "0",
-   "fieldname": "stop_auto_review",
-   "fieldtype": "Check",
-   "label": "Stop Auto Review"
-  },
   {
    "description": "This keys are added to site config on saas signup",
    "fieldname": "site_config",
@@ -407,10 +390,6 @@
    "fieldtype": "Check",
    "label": "Collect Feedback"
   },
-  {
-   "fieldname": "column_break_bcjk",
-   "fieldtype": "Column Break"
-  },
   {
    "fieldname": "published_on",
    "fieldtype": "Date",
@@ -455,7 +434,7 @@
    "link_fieldname": "marketplace_app"
   }
  ],
- "modified": "2026-03-24 22:23:13.317135",
+ "modified": "2026-04-16 12:40:05.646198",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Marketplace App",
diff --git a/press/press/doctype/marketplace_app/marketplace_app.py b/press/press/doctype/marketplace_app/marketplace_app.py
index 31df7cf978f..364fbfa7e00 100644
--- a/press/press/doctype/marketplace_app/marketplace_app.py
+++ b/press/press/doctype/marketplace_app/marketplace_app.py
@@ -74,15 +74,6 @@ class MarketplaceApp(WebsiteGenerator):
 		privacy_policy: DF.Data | None
 		published: DF.Check
 		published_on: DF.Date | None
-		review_stage: DF.Literal[
-			"Not Started",
-			"Description Missing",
-			"Logo Missing",
-			"App Release Not Reviewed",
-			"Ready for Review",
-			"Ready to Publish",
-			"Rejected",
-		]
 		route: DF.Data | None
 		run_after_install_script: DF.Check
 		run_after_uninstall_script: DF.Check
@@ -92,7 +83,6 @@ class MarketplaceApp(WebsiteGenerator):
 		site_config: DF.JSON | None
 		sources: DF.Table[MarketplaceAppVersion]
 		status: DF.Literal["Draft", "Published", "In Review", "Attention Required", "Rejected", "Disabled"]
-		stop_auto_review: DF.Check
 		subject: DF.Data | None
 		subscription_type: DF.Literal["Free", "Paid", "Freemium"]
 		subscription_update_hook: DF.Data | None
@@ -108,7 +98,6 @@ class MarketplaceApp(WebsiteGenerator):
 		"title",
 		"status",
 		"description",
-		"review_stage",
 	]
 
 	def autoname(self):
@@ -696,7 +685,7 @@ def listing_details(self):
 	@dashboard_whitelist()
 	def mark_app_ready_for_review(self):
 		# TODO: Start security check and auto deploy process here
-		self.review_stage = "Ready for Review"
+		self.status = "In Review"
 		self.save()
 
 	@dashboard_whitelist()
diff --git a/press/templates/emails/marketplace_audit_report.html b/press/templates/emails/marketplace_audit_report.html
new file mode 100644
index 00000000000..fce255dc979
--- /dev/null
+++ b/press/templates/emails/marketplace_audit_report.html
@@ -0,0 +1,165 @@
+{% import "templates/emails/macros.html" as utils %}
+{% extends "templates/emails/base.html" %}
+
+{% set tone = {
+    "Critical":          {"bg": "#FEF2F2", "fg": "#B91C1C", "dot": "#DC2626"},
+    "Major":             {"bg": "#FFF7ED", "fg": "#C2410C", "dot": "#EA580C"},
+    "Minor":             {"bg": "#FEFCE8", "fg": "#A16207", "dot": "#CA8A04"},
+    "Info":              {"bg": "#EFF6FF", "fg": "#1D4ED8", "dot": "#2563EB"},
+    "Fail":              {"bg": "#FEF2F2", "fg": "#B91C1C", "dot": "#DC2626"},
+    "Warn":              {"bg": "#FFF7ED", "fg": "#C2410C", "dot": "#EA580C"},
+    "Needs Improvement": {"bg": "#EFF6FF", "fg": "#1D4ED8", "dot": "#2563EB"},
+    "Pass":              {"bg": "#F0FDF4", "fg": "#15803D", "dot": "#16A34A"},
+    "Inconclusive":      {"bg": "#F9FAFB", "fg": "#4B5563", "dot": "#9CA3AF"}
+} %}
+{% set neutral = {"bg": "#F3F4F6", "fg": "#4B5563", "dot": "#9CA3AF"} %}
+
+{% set result_heading = {
+    "Pass":              "Audit Passed",
+    "Needs Improvement": "Needs Improvement",
+    "Warn":              "Audit Passed with Warnings",
+    "Fail":              "Audit Failed",
+    "Inconclusive":      "Audit Inconclusive"
+} %}
+
+{% set font_stack = "-apple-system, BlinkMacSystemFont, 'Inter', sans-serif" %}
+{% set mono_stack = "ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace" %}
+
+{% set header_tone = tone.get(audit_result, neutral) %}
+{% set issue_count = failing_checks | length %}
+
+{% macro pill(label, scheme) -%}
+    <span style="display: inline-block; padding: 2px 8px; border-radius: 4px;
+                 font-size: 11px; font-weight: 500; letter-spacing: 0.01em;
+                 background: {{ scheme.bg }}; color: {{ scheme.fg }};">{{ label }}</span>
+{%- endmacro %}
+
+{% block content %}
+<td style="font-family: {{ font_stack }}; color: #1F2937;">
+<div style="padding: 32px 8px;">
+
+    <p style="margin: 0 0 6px; font-size: 22px; font-weight: 600; line-height: 1.25;
+              color: {{ header_tone.fg }};">
+        {{ result_heading.get(audit_result, audit_result) }}
+    </p>
+    <p style="margin: 0 0 24px; font-size: 14px; line-height: 1.5; color: #6B7280;">
+        {% if issue_count > 0 -%}
+            {{ issue_count }} issue{{ 's' if issue_count != 1 else '' }} found in
+        {%- else -%}
+            For
+        {%- endif %}
+        <span style="color: #111827; font-weight: 500;">{{ app_title }}</span>
+    </p>
+
+    {% if audit_summary %}
+    <p style="margin: 0 0 20px; font-size: 14px; line-height: 1.65; color: #374151;">
+        {{ audit_summary }}
+    </p>
+    {% endif %}
+
+    {% if issue_count > 0 %}
+    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+           style="background: #F9FAFB; border: 1px solid #E5E7EB; border-radius: 6px; margin-bottom: 28px;">
+        <tr>
+            <td style="padding: 14px 16px; font-size: 13px; line-height: 1.65; color: #374151;">
+                Please review and fix the issues listed below, then publish a new release and
+                resubmit for approval. A fresh audit will run automatically on the new release.
+            </td>
+        </tr>
+    </table>
+    {% endif %}
+
+    {# ── Checks ── #}
+    {% for check in failing_checks %}
+    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+           style="border: 1px solid #E5E7EB; border-radius: 6px; margin-bottom: 12px;
+                  border-collapse: separate;">
+        <tr>
+            <td style="padding: 16px 18px;">
+
+                {# Check name + severity/category/result pills #}
+                <p style="margin: 0 0 10px; font-size: 14px; font-weight: 600; color: #111827; line-height: 1.4;">
+                    {{ check.check_name }}
+                </p>
+                <div style="margin-bottom: 12px;">
+                    {{ pill(check.severity, tone.get(check.severity, neutral)) }}
+                    {{ pill(check.result, tone.get(check.result, neutral)) }}
+                </div>
+
+                {% if check.message %}
+                <p style="margin: 0 0 12px; font-size: 13px; line-height: 1.65; color: #374151;">
+                    {{ check.message }}
+                </p>
+                {% endif %}
+
+                {# ── Semgrep occurrences — rule-id primary, location secondary ── #}
+                {% if check.details and check.details.occurrences %}
+                <div style="margin-bottom: 14px;">
+                {% for occ in check.details.occurrences %}
+                    <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+                           style="background: #F9FAFB; border: 1px solid #E5E7EB; border-radius: 4px;
+                                  margin-bottom: 6px;">
+                        <tr>
+                            <td style="padding: 10px 12px;">
+                                {# Primary: rule identifier #}
+                                {% if occ.rule_id %}
+                                <p style="margin: 0 0 2px; font-size: 12px; font-weight: 600; color: #111827;
+                                          font-family: {{ mono_stack }}; line-height: 1.5;">
+                                    {{ occ.rule_id }}
+                                </p>
+                                {% endif %}
+                                {# Secondary: file path and line #}
+                                <p style="margin: 0 0 8px; font-size: 11px; color: #6B7280;
+                                          font-family: {{ mono_stack }}; line-height: 1.5; word-break: break-all;">
+                                    {{ occ.path or '–' }}{% if occ.start and occ.start.line %}<span style="color: #9CA3AF;">&nbsp;&middot;&nbsp;</span>line {{ occ.start.line }}{% endif %}
+                                </p>
+                                {# Body: the actual finding message #}
+                                {% if occ.message %}
+                                <p style="margin: 0; font-size: 12px; line-height: 1.6; color: #374151;">
+                                    {{ occ.message }}
+                                </p>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </table>
+                {% endfor %}
+                </div>
+                {% endif %}
+
+                {% if check.remediation %}
+                <table width="100%" cellpadding="0" cellspacing="0" role="presentation"
+                       style="border-collapse: collapse;">
+                    <tr>
+                        <td width="3" style="background: #16A34A; border-radius: 2px;"></td>
+                        <td width="12"></td>
+                        <td style="padding: 2px 0;">
+                            <p style="margin: 0 0 3px; font-size: 10px; font-weight: 600;
+                                      color: #16A34A; text-transform: uppercase; letter-spacing: 0.06em;">
+                                How to fix
+                            </p>
+                            <p style="margin: 0; font-size: 13px; line-height: 1.6; color: #374151;">
+                                {{ check.remediation }}
+                            </p>
+                        </td>
+                    </tr>
+                </table>
+                {% endif %}
+
+            </td>
+        </tr>
+    </table>
+    {% endfor %}
+
+    {{ utils.separator() }}
+
+    <p style="margin: 0 0 16px; font-size: 12px; line-height: 1.65; color: #6B7280;">
+        This is an automated report from the Frappe Cloud Marketplace Auditor (beta).
+        If you believe this report is incorrect or need help interpreting it, reach out to
+        {{ utils.link('support.frappe.io', 'https://support.frappe.io') }}.
+    </p>
+
+    {{ utils.signature() }}
+
+</div>
+</td>
+{% endblock %}