diff --git a/app/components/cru-persistent-volume-claim/template.hbs b/app/components/cru-persistent-volume-claim/template.hbs
index 448b1b9b8..b3ba82e05 100644
--- a/app/components/cru-persistent-volume-claim/template.hbs
+++ b/app/components/cru-persistent-volume-claim/template.hbs
@@ -145,6 +145,16 @@
       </div>
     </div>
   {{/accordion-list-item}}
+  {{#if isView}}
+    {{resource-event-list
+      resourceType=(t 'generic.persistentVolumeClaim')
+      expandAll=al.expandAll
+      expandFn=expandFn
+      namespaceId=model.namespaceId
+      name=model.name
+      kind="PersistentVolumeClaim"
+    }}
+  {{/if}}
 {{/accordion-list}}
 
 {{#unless isView}}
diff --git a/app/components/cru-persistent-volume/template.hbs b/app/components/cru-persistent-volume/template.hbs
index 19972a232..e2c817c22 100644
--- a/app/components/cru-persistent-volume/template.hbs
+++ b/app/components/cru-persistent-volume/template.hbs
@@ -137,6 +137,16 @@
       }}
     </div>
   {{/accordion-list-item}}
+
+  {{#if isView}}
+      {{resource-event-list
+        resourceType=(t 'generic.persistentVolume')
+        expandAll=al.expandAll
+        expandFn=expandFn
+        name=model.name
+        kind="PersistentVolume"
+      }}
+    {{/if}}
 {{/accordion-list}}
 
 {{#unless isView}}
diff --git a/app/components/resource-event-list/component.js b/app/components/resource-event-list/component.js
index 56d99d36a..b60f4a7e6 100644
--- a/app/components/resource-event-list/component.js
+++ b/app/components/resource-event-list/component.js
@@ -3,6 +3,8 @@ import { inject as service } from '@ember/service';
 import layout from './template';
 import { set, get, observer } from '@ember/object';
 
+const NON_NAMESPACED_RESOURCES = ['PersistentVolume'];
+
 export default Component.extend({
   globalStore: service(),
   scope:       service(),
@@ -65,8 +67,18 @@ export default Component.extend({
   }),
 
   fetchEvents() {
+    const query = `fieldSelector=involvedObject.name=${ get(this, 'name') },involvedObject.kind=${ get(this, 'kind').capitalize() }`;
+
+    let url = `/k8s/clusters/${ get(this, 'scope.currentCluster.id') }/api/v1/`;
+
+    if ( NON_NAMESPACED_RESOURCES.indexOf(get(this, 'kind')) === -1 ) {
+      url += `namespaces/${ get(this, 'namespaceId') }/`;
+    }
+
+    url += `events?${ query }`;
+
     get(this, 'globalStore').rawRequest({
-      url:    `/k8s/clusters/${ get(this, 'scope.currentCluster.id') }/api/v1/namespaces/${ get(this, 'namespaceId') }/events?fieldSelector=involvedObject.name=${ get(this, 'name') }`,
+      url,
       method: 'GET',
     })
       .then((xhr) => {
diff --git a/app/container/template.hbs b/app/container/template.hbs
index 07b65e422..6a9c5c33e 100644
--- a/app/container/template.hbs
+++ b/app/container/template.hbs
@@ -113,6 +113,7 @@
       expandFn=expandFn
       namespaceId=model.namespaceId
       name=model.name
+      kind="Pod"
     }}
   {{/accordion-list}}
 </section>
diff --git a/app/workload/template.hbs b/app/workload/template.hbs
index dd8e6b321..066e28b48 100644
--- a/app/workload/template.hbs
+++ b/app/workload/template.hbs
@@ -87,6 +87,7 @@
       expandFn=expandFn
       namespaceId=service.namespaceId
       name=service.name
+      kind=service.type
     }}
 
     {{#if (or (eq service.type 'job') (eq service.type 'cronJob'))}}
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 5c2dbcc78..5fe9034a6 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -79,6 +79,8 @@ generic:
   ports: Ports
   prefix: prefix
   project: Project
+  persistentVolumeClaim: persistent volume claim
+  persistentVolume: persistent volume
   random: Random
   remove: Remove
   role: Role