diff --git a/scripts/prepare-release.sh b/scripts/prepare-release.sh
index b90cd86..7ae153f 100755
--- a/scripts/prepare-release.sh
+++ b/scripts/prepare-release.sh
@@ -164,8 +164,7 @@ create_release_file() {
     yq -i '.spec.releasePlan |= (sub("RELEASE_ENV", env(RELEASE_ENV)) | sub("X-Y", env(VERSION_DASHED)))' "${target}"
     yq -i '(.spec.data.mapping.defaults.tags[] | select(test("X\\.Y\\.Z"))) |= sub("X\\.Y\\.Z", env(RELEASE_VERSION))' "${target}"
     yq -i '(.spec.data.mapping.defaults.tags[] | select(test("X\\.Y"))) |= sub("X\\.Y", env(VERSION))' "${target}"
-    yq -i '.spec.data.releaseNotes.topic |= sub("X\\.Y\\.Z", env(RELEASE_VERSION))' "${target}"
-    yq -i '.spec.data.releaseNotes.description |= sub("X\\.Y\\.Z", env(RELEASE_VERSION))' "${target}"
+    yq -i '(.spec.data.releaseNotes.references[] | select(test("X\\.Y\\.Z"))) |= sub("X\\.Y\\.Z", env(RELEASE_VERSION))' "${target}"
 }
 
 main() {
diff --git a/scripts/templates/release-resource.yaml b/scripts/templates/release-resource.yaml
index 4eab02d..cafaceb 100644
--- a/scripts/templates/release-resource.yaml
+++ b/scripts/templates/release-resource.yaml
@@ -17,10 +17,7 @@ spec:
           - "X.Y.Z"
           - "X.Y.Z-{{ incrementer }}"
     releaseNotes:
-      synopsis: 'Agentic cluster security suite release'
-      topic: 'The Tech Preview X.Y.Z (TP) release of agentic cluster security suite introduces early access to ACS MCP server'
-      description: 'The Tech Preview X.Y.Z (TP) release of agentic cluster security suite.'
-      solution: 'The agentic cluster security suite bridges Red Hat Advanced Cluster Security for Kubernetes data with advanced AI models.'
       type: RHEA
       references:
         - 'https://github.com/stackrox/stackrox-mcp/blob/main/README.md#quick-start'
+        - 'https://github.com/stackrox/stackrox-mcp/releases/tag/X.Y.Z'