diff --git a/client/app/scripts/actions/app-actions.js b/client/app/scripts/actions/app-actions.js
index 960d71095..a16b5b9d3 100644
--- a/client/app/scripts/actions/app-actions.js
+++ b/client/app/scripts/actions/app-actions.js
@@ -825,7 +825,8 @@ export function getImagesForService(orgId, serviceId) {
       serviceId
     });
 
-    api.getFluxImages(orgId, serviceId)
+    // Use the fluxv2 api
+    api.getFluxImages(orgId, serviceId, 2)
       .then((services) => {
         dispatch({
           type: ActionTypes.RECEIVE_SERVICE_IMAGES,
diff --git a/client/app/scripts/components/node-details/node-details-image-status.js b/client/app/scripts/components/node-details/node-details-image-status.js
index f00f0868a..5ad13701b 100644
--- a/client/app/scripts/components/node-details/node-details-image-status.js
+++ b/client/app/scripts/components/node-details/node-details-image-status.js
@@ -6,7 +6,7 @@ import { CircularProgress } from 'weaveworks-ui-components';
 
 import { getImagesForService } from '../../actions/app-actions';
 
-const topologyWhitelist = ['services', 'deployments'];
+const topologyWhitelist = ['kube-controllers'];
 
 function getNewImages(images, currentId) {
   // Assume that the current image is always in the list of all available images.
@@ -107,7 +107,8 @@ class NodeDetailsImageStatus extends React.PureComponent {
 
 function mapStateToProps({ scope }, { metadata, name }) {
   const namespace = find(metadata, d => d.id === 'kubernetes_namespace');
-  const serviceId = namespace ? `${namespace.value}/${name}` : null;
+  const nodeType = find(metadata, d => d.id === 'kubernetes_node_type');
+  const serviceId = (namespace && nodeType) ? `${namespace.value}:${nodeType.value.toLowerCase()}/${name}` : null;
   const { containers, isFetching, errors } = scope.getIn(['serviceImages', serviceId]) || {};
 
   return {