diff --git a/garden-service/src/plugins/kubernetes/util.ts b/garden-service/src/plugins/kubernetes/util.ts
index f8c3a0bc9e..30f08a6f16 100644
--- a/garden-service/src/plugins/kubernetes/util.ts
+++ b/garden-service/src/plugins/kubernetes/util.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Bluebird from "bluebird"
-import { get, flatten, uniqBy } from "lodash"
+import { get, flatten, uniqBy, sortBy } from "lodash"
 import { ChildProcess } from "child_process"
 import getPort = require("get-port")
 const AsyncLock = require("async-lock")
@@ -65,7 +65,30 @@ export async function getAllPodNames(api: KubeApi, namespace: string, resources:
  */
 export async function getWorkloadPods(api: KubeApi, namespace: string, resource: KubernetesWorkload) {
   const selector = resource.spec.selector.matchLabels
-  return getPods(api, resource.metadata.namespace || namespace, selector)
+  const pods = await getPods(api, resource.metadata.namespace || namespace, selector)
+
+  if (resource.kind === "Deployment") {
+    // Make sure we only return the pods from the current ReplicaSet
+    const selectorString = labelSelectorToString(selector)
+    const replicaSets = await api.apps.listNamespacedReplicaSet(
+      resource.metadata.namespace || namespace, false, undefined, undefined, undefined, selectorString,
+    )
+
+    if (replicaSets.items.length === 0) {
+      return []
+    }
+
+    const sorted = sortBy(replicaSets.items, r => r.metadata.creationTimestamp!)
+    const currentReplicaSet = sorted[replicaSets.items.length - 1]
+
+    return pods.filter(pod => pod.metadata.name.startsWith(currentReplicaSet.metadata.name))
+  } else {
+    return pods
+  }
+}
+
+export function labelSelectorToString(selector: { [key: string]: string }) {
+  return Object.entries(selector).map(([k, v]) => `${k}=${v}`).join(",")
 }
 
 /**
@@ -74,7 +97,7 @@ export async function getWorkloadPods(api: KubeApi, namespace: string, resource:
 export async function getPods(
   api: KubeApi, namespace: string, selector: { [key: string]: string },
 ): Promise<KubernetesServerResource<V1Pod>[]> {
-  const selectorString = Object.entries(selector).map(([k, v]) => `${k}=${v}`).join(",")
+  const selectorString = labelSelectorToString(selector)
   const res = await api.core.listNamespacedPod(
     namespace, true, undefined, undefined, undefined, selectorString,
   )