diff --git a/core/src/plugins/kubernetes/kubernetes-type/common.ts b/core/src/plugins/kubernetes/kubernetes-type/common.ts
index b4a85b3ea5..e58f2553f0 100644
--- a/core/src/plugins/kubernetes/kubernetes-type/common.ts
+++ b/core/src/plugins/kubernetes/kubernetes-type/common.ts
@@ -150,19 +150,7 @@ export async function getManifests({
   }
 
   const declaredManifests = await readManifests(ctx, action, log)
-
-  if (action.kind === "Deploy") {
-    // Add metadata ConfigMap to aid quick status check
-    const metadataManifest = getMetadataManifest(action, defaultNamespace, declaredManifests)
-    const declaredMetadataManifest: DeclaredManifest = {
-      declaration: { type: "inline", index: declaredManifests.length },
-      manifest: metadataManifest,
-    }
-    declaredManifests.push(declaredMetadataManifest)
-  }
-
   const patchedManifests = await Promise.all(declaredManifests.map(patchManifest))
-
   const unmatchedPatches = (actionSpec.patchResources || []).filter((p) => {
     const manifest = declaredManifests.find((m) => m.manifest.kind === p.kind && m.manifest.metadata.name === p.name)
     if (manifest) {
@@ -177,6 +165,16 @@ export async function getManifests({
     )
   }
 
+  if (action.kind === "Deploy") {
+    // Add metadata ConfigMap to aid quick status check
+    const metadataManifest = getMetadataManifest(action, defaultNamespace, patchedManifests)
+    const declaredMetadataManifest: DeclaredManifest = {
+      declaration: { type: "inline", index: patchedManifests.length },
+      manifest: metadataManifest,
+    }
+    patchedManifests.push(declaredMetadataManifest)
+  }
+
   const postProcessedManifests = await Promise.all(patchedManifests.map(postProcessManifest))
 
   validateDeclaredManifests(postProcessedManifests)
diff --git a/core/test/integ/src/plugins/kubernetes/kubernetes-type/common.ts b/core/test/integ/src/plugins/kubernetes/kubernetes-type/common.ts
index e13674a905..eecd956a5a 100644
--- a/core/test/integ/src/plugins/kubernetes/kubernetes-type/common.ts
+++ b/core/test/integ/src/plugins/kubernetes/kubernetes-type/common.ts
@@ -436,6 +436,54 @@ describe("getManifests", () => {
       expect(manifests[0].spec.replicas).to.eql(3)
       expect(manifests[1].data.hello).to.eql("patched-world")
     })
+    it("should store patched version in metadata ConfigMap", async () => {
+      const action = cloneDeep(graph.getDeploy("deploy-action"))
+      action["_config"]["spec"]["patchResources"] = [
+        {
+          name: "busybox-deployment",
+          kind: "Deployment",
+          patch: {
+            metadata: {
+              namespace: "patched-namespace-deployment",
+            },
+          },
+        },
+        {
+          name: "test-configmap",
+          kind: "ConfigMap",
+          patch: {
+            metadata: {
+              namespace: "patched-namespace-configmap",
+            },
+          },
+        },
+      ]
+      const resolvedAction = await garden.resolveAction<KubernetesDeployAction>({
+        action,
+        log: garden.log,
+        graph,
+      })
+
+      const manifests = await getManifests({ ctx, api, action: resolvedAction, log: garden.log, defaultNamespace })
+
+      const metadataConfigMap = manifests.filter((m) => m.metadata.name === "garden-meta-deploy-deploy-action")
+      expect(JSON.parse(metadataConfigMap[0].data.manifestMetadata)).to.eql({
+        "Deployment/busybox-deployment": {
+          apiVersion: "apps/v1",
+          key: "Deployment/busybox-deployment",
+          kind: "Deployment",
+          name: "busybox-deployment",
+          namespace: "patched-namespace-deployment", // <--- The patched namespace should be used here
+        },
+        "ConfigMap/test-configmap": {
+          apiVersion: "v1",
+          key: "ConfigMap/test-configmap",
+          kind: "ConfigMap",
+          name: "test-configmap",
+          namespace: "patched-namespace-configmap", // <--- The patched namespace should be used here
+        },
+      })
+    })
     it("should apply patches to file and inline manifests", async () => {
       const action = cloneDeep(graph.getDeploy("deploy-action"))
       action["_config"]["spec"]["manifests"] = [