diff --git a/Makefile b/Makefile
index 92b3ec53..82148730 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DATE       ?= $(shell TZ=UTC date -j -f "%s" ${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:
 else
 DATE       ?= $(shell date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ")
 endif
-VERSION    ?= v0.40.1
+VERSION    ?= v0.40.2
 IMG_NAME   := derailed/k9s
 IMAGE      := ${IMG_NAME}:${VERSION}
 
diff --git a/change_logs/release_v0.40.2.md b/change_logs/release_v0.40.2.md
new file mode 100644
index 00000000..f56203fc
--- /dev/null
+++ b/change_logs/release_v0.40.2.md
@@ -0,0 +1,46 @@
+<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/k9s.png" align="center" width="800" height="auto"/>
+
+# Release v0.40.2
+
+## Notes
+
+Thank you to all that contributed with flushing out issues and enhancements for K9s!
+I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev
+and see if we're happier with some of the fixes!
+If you've filed an issue please help me verify and close.
+
+Your support, kindness and awesome suggestions to make K9s better are, as ever, very much noted and appreciated!
+Also big thanks to all that have allocated their own time to help others on both slack and on this repo!!
+
+As you may know, K9s is not pimped out by corps with deep pockets, thus if you feel K9s is helping your Kubernetes journey,
+please consider joining our [sponsorship program](https://github.com/sponsors/derailed) and/or make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer)
+
+On Slack? Please join us [K9slackers](https://join.slack.com/t/k9sers/shared_invite/enQtOTA5MDEyNzI5MTU0LWQ1ZGI3MzliYzZhZWEyNzYxYzA3NjE0YTk1YmFmNzViZjIyNzhkZGI0MmJjYzhlNjdlMGJhYzE2ZGU1NjkyNTM)
+
+## Maintenance Release!
+
+😳 Aye! Buzz kill on the 0.40.0 aftermath ;( Hot fix in progress...🙀 👻
+
+Likely additional `disturbance in the farce` might be observed.
+Thank you all for giving this drop a rinse and reporting back!! 😍
+
+---
+
+## Videos Are In The Can!
+
+Please dial [K9s Channel](https://www.youtube.com/channel/UC897uwPygni4QIjkPCpgjmw) for up coming content...
+
+* [K9s v0.40.0 -Column Blow- Sneak peek](https://youtu.be/iy6RDozAM4A)
+* [K9s v0.31.0 Configs+Sneak peek](https://youtu.be/X3444KfjguE)
+* [K9s v0.30.0 Sneak peek](https://youtu.be/mVBc1XneRJ4)
+* [Vulnerability Scans](https://youtu.be/ULkl0MsaidU)
+
+---
+
+## Resolved Issues
+
+* [#3116](https://github.com/derailed/k9s/issues/3116) Cannot list custom CRD's since v0.40.1
+
+---
+
+<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/imhotep_logo.png" width="32" height="auto"/> © 2024 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0)
\ No newline at end of file
diff --git a/internal/dao/dynamic.go b/internal/dao/dynamic.go
index 4af90160..8f7d6550 100644
--- a/internal/dao/dynamic.go
+++ b/internal/dao/dynamic.go
@@ -35,7 +35,7 @@ func (d *Dynamic) Get(ctx context.Context, path string) (runtime.Object, error)
 
 // List returns a collection of resources as one or more table objects.
 func (d *Dynamic) List(ctx context.Context, ns string) ([]runtime.Object, error) {
-	return d.toTable(ctx, ns)
+	return d.toTable(ctx, ns+"/")
 }
 
 func (d *Dynamic) toTable(ctx context.Context, fqn string) ([]runtime.Object, error) {
diff --git a/internal/dao/registry.go b/internal/dao/registry.go
index 44cdbbe0..74cf9446 100644
--- a/internal/dao/registry.go
+++ b/internal/dao/registry.go
@@ -431,7 +431,7 @@ func newGVRFromCRD(crd *apiext.CustomResourceDefinition) (client.GVR, apiext.Cus
 			return client.NewGVRFromMeta(metav1.APIResource{
 				Kind:    crd.Spec.Names.Kind,
 				Group:   crd.Spec.Group,
-				Name:    strings.TrimSuffix(crd.Name, "."+crd.Spec.Group),
+				Name:    crd.Spec.Names.Plural,
 				Version: v.Name,
 			}), v, true
 		}
diff --git a/internal/model/helpers.go b/internal/model/helpers.go
index cb657997..3d7efbcf 100644
--- a/internal/model/helpers.go
+++ b/internal/model/helpers.go
@@ -38,7 +38,7 @@ func resourceMeta(gvr client.GVR) ResourceMeta {
 		}
 	}
 	if meta.DAO == nil {
-		meta.DAO = &dao.Resource{}
+		meta.DAO = new(dao.Resource)
 	}
 
 	return meta
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 00423a23..e2cf7000 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: k9s
 base: core22
-version: 'v0.40.1'
+version: 'v0.40.2'
 summary: K9s is a CLI to view and manage your Kubernetes clusters.
 description: |
   K9s is a CLI to view and manage your Kubernetes clusters. By leveraging a terminal UI, you can easily traverse Kubernetes resources and view the state of your clusters in a single powerful session.