diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39b9692c62427a16206ad6125369b1cc003d024e..2259d768d16078f5a489a015d75c772fd39d56ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,43 +4,69 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [0.0.4-bb.0] - 2021-05-12
+
+### Added
+
+- Moved all resources into `chart/templates/console/`
+- Updated twistlock to 21.04.412
+
 ## [0.0.3-bb.4] - 2021-04-06
+
 ### Added
+
 - Resource and Toleration Values
 
 ## [0.0.3-bb.3] - 2021-04-05
+
 ### Changed
+
 - Affinity values modified to standardize
 
 ## [0.0.3-bb.2] - 2021-03-31
+
 ### Added
+
 - Values passthroughs for affinity and anti-affinity added
+
 ### Changed
+
 - Split out resources into separate yaml files
 
 ## [0.0.3-bb.0] - 2021-02-12
+
 ### Added
+
 - Options under istio values to control labels, annotations, gateways and full URL modification for twistlock VirtualService.
 
 ### Changed
+
 - Position of "hostname" value in values, from "console.hostname" to toplevel "hostname".
 
 ## [0.0.2-bb.2] - 2021-02-11
+
 ### Added
+
 - imagePullSecret array to values.
 
 ### Changed
+
 - Image based on 20.12 version from IronBank.
 
 ## [0.0.2-bb.1] - 2021-01-27
+
 ### Changed
+
 - Updating all "dsop.io" URLs to "dso.mil".
 
 ## [0.0.2-bb.0] - 2020-12-15
+
 ### Added
+
 - Istio flag to enable VirtualService when true.
 
 ## [0.0.1-bb.0] - 2020-06-15
+
 ### Added
-- Initial manifests for deploying Twistlock version 20.04.196.
 
+- Initial manifests for deploying Twistlock version 20.04.196.
diff --git a/README.md b/README.md
index 67768c444e59edb26f514d3bc1fbd337af014f0a..967675e4fe3e0b7abe98106b93c845b653124646 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ The following command can be authenticated by TOKEN or Username/Password.
 
 ##### Download the daemonset.yaml.  The default Image is set to teh Prisma server.  We need to pull images from Platform 1.  The image URL needs to be changed
 
-##### Image: registry.dso.mil/platform-one/apps/twistlock/defender:20.04.169
+##### Image: registry.dso.mil/platform-one/apps/twistlock/defender:21.04.412
 
 2) Install Defender
 
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 7e5399a0a5d22afd73b64f7aebbc74c5666b7cba..8f810a3819d386c44f5c61b5c606365ca7a39966 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: twistlock
-version: 0.0.3-bb.4
-appVersion: 20.12.531
+version: 0.0.4-bb.0
+appVersion: 21.04.412
diff --git a/chart/templates/configmap.yaml b/chart/templates/console/configmap.yaml
similarity index 100%
rename from chart/templates/configmap.yaml
rename to chart/templates/console/configmap.yaml
diff --git a/chart/templates/deployment.yaml b/chart/templates/console/deployment.yaml
similarity index 100%
rename from chart/templates/deployment.yaml
rename to chart/templates/console/deployment.yaml
diff --git a/chart/templates/pvc.yaml b/chart/templates/console/pvc.yaml
similarity index 98%
rename from chart/templates/pvc.yaml
rename to chart/templates/console/pvc.yaml
index 28e7f078ed544081bec558e3caf70c8e8d697623..e419f32239c1a85dc5bb0d4f637ca672a2061c62 100644
--- a/chart/templates/pvc.yaml
+++ b/chart/templates/console/pvc.yaml
@@ -1,3 +1,4 @@
+---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
diff --git a/chart/templates/service.yaml b/chart/templates/console/service.yaml
similarity index 98%
rename from chart/templates/service.yaml
rename to chart/templates/console/service.yaml
index 2e3391b92d474bf43cdba65942941c3fcad09109..6e48d374a6ea4f5db40d607b23353ac71085f2db 100644
--- a/chart/templates/service.yaml
+++ b/chart/templates/console/service.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/console/serviceaccount.yaml
similarity index 98%
rename from chart/templates/serviceaccount.yaml
rename to chart/templates/console/serviceaccount.yaml
index 4b0cd7742783bec92c8b7e105d467dccb93db84e..8bf80df9ec18036a53233456e7dc4648d7853e22 100644
--- a/chart/templates/serviceaccount.yaml
+++ b/chart/templates/console/serviceaccount.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: v1
 kind: ServiceAccount # Service Account is used for managing security context constraints policies in Openshift (SCC)
 metadata:
diff --git a/chart/templates/servicemonitor.yaml b/chart/templates/console/servicemonitor.yaml
similarity index 100%
rename from chart/templates/servicemonitor.yaml
rename to chart/templates/console/servicemonitor.yaml
diff --git a/chart/templates/console-vs.yaml b/chart/templates/console/virtualservice.yaml
similarity index 100%
rename from chart/templates/console-vs.yaml
rename to chart/templates/console/virtualservice.yaml
diff --git a/chart/values.yaml b/chart/values.yaml
index e93950c40d1d2b43e08cc9e104dc1e6bdde94bd2..1dfb72a41a6ddf18043db807bdf6f3635a89464c 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -22,7 +22,7 @@ imagePullSecrets: []
 console:
   image:
     repository: registry1.dso.mil/ironbank/twistlock/console/console
-    tag: 20.12.531
+    tag: 21.04.412
 
   persistence:
     size: 100Gi