diff --git a/addons/dynamodb-chart/Chart.yaml b/addons/dynamodb-chart/Chart.yaml
index 53c90de93..0aa993c80 100644
--- a/addons/dynamodb-chart/Chart.yaml
+++ b/addons/dynamodb-chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: dynamodb-chart
 description: A Helm chart for the ACK service controller for Amazon DynamoDB (DynamoDB)
-version: 1.2.3
-appVersion: 1.2.3
+version: 1.2.4
+appVersion: 1.2.4
 home: https://github.com/aws-controllers-k8s/dynamodb-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/addons/dynamodb-chart/templates/NOTES.txt b/addons/dynamodb-chart/templates/NOTES.txt
index 519e2338b..6b207163c 100644
--- a/addons/dynamodb-chart/templates/NOTES.txt
+++ b/addons/dynamodb-chart/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.2.3".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/dynamodb-controller:1.2.4".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
diff --git a/addons/dynamodb-chart/values.yaml b/addons/dynamodb-chart/values.yaml
index b9e37242d..de3d9ae9a 100644
--- a/addons/dynamodb-chart/values.yaml
+++ b/addons/dynamodb-chart/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/dynamodb-controller
-  tag: 1.2.3
+  tag: 1.2.4
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/addons/porter-agent/Chart.yaml b/addons/porter-agent/Chart.yaml
index 57dfb7760..9fa57a3d5 100644
--- a/addons/porter-agent/Chart.yaml
+++ b/addons/porter-agent/Chart.yaml
@@ -13,12 +13,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.27.0
+version: 0.28.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.1.9"
+appVersion: "3.2.3"
 dependencies:
   - name: "loki"
     repository: "https://chart-addons.getporter.dev"
diff --git a/addons/porter-agent/values.yaml b/addons/porter-agent/values.yaml
index 215ba0cfe..b6481073c 100644
--- a/addons/porter-agent/values.yaml
+++ b/addons/porter-agent/values.yaml
@@ -1,5 +1,5 @@
 agent:
-  image: "public.ecr.aws/o1j4x7p4/porter-agent:v3.2.2"
+  image: "public.ecr.aws/o1j4x7p4/porter-agent:v3.2.3"
   cfAccessToken: ""
   porterHost: "dashboard.getporter.dev"
   porterPort: "80"
diff --git a/addons/rds-chart/Chart.yaml b/addons/rds-chart/Chart.yaml
index f9830393a..e7e3a531b 100644
--- a/addons/rds-chart/Chart.yaml
+++ b/addons/rds-chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: rds-chart
 description: A Helm chart for the ACK service controller for Amazon Relational Database Service (RDS)
-version: 1.1.7
-appVersion: 1.1.7
+version: 1.1.8
+appVersion: 1.1.8
 home: https://github.com/aws-controllers-k8s/rds-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:
diff --git a/addons/rds-chart/templates/NOTES.txt b/addons/rds-chart/templates/NOTES.txt
index 005b9b390..198a65f58 100644
--- a/addons/rds-chart/templates/NOTES.txt
+++ b/addons/rds-chart/templates/NOTES.txt
@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:1.1.7".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/rds-controller:1.1.8".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"
diff --git a/addons/rds-chart/templates/deployment.yaml b/addons/rds-chart/templates/deployment.yaml
index f40b5f22a..cea38ec98 100644
--- a/addons/rds-chart/templates/deployment.yaml
+++ b/addons/rds-chart/templates/deployment.yaml
@@ -123,7 +123,7 @@ spec:
             readOnly: true
         {{- end }}
         {{- if .Values.deployment.extraVolumeMounts -}}
-          {{ toYaml .Values.deployment.extraVolumeMounts | nindent 12 }}
+          {{ toYaml .Values.deployment.extraVolumeMounts | nindent 10 }}
         {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
@@ -151,11 +151,11 @@ spec:
       hostNetwork: {{ .Values.deployment.hostNetwork }}
       dnsPolicy: {{ .Values.deployment.dnsPolicy }}
       volumes:
-      {{- if .Values.aws.credentials.secretName -}}
+      {{- if .Values.aws.credentials.secretName }}
         - name: {{ .Values.aws.credentials.secretName }}
           secret:
             secretName: {{ .Values.aws.credentials.secretName }}
-      {{ end -}}
+      {{- end }}
 {{- if .Values.deployment.extraVolumes }}
 {{ toYaml .Values.deployment.extraVolumes | indent 8}}
 {{- end }}
diff --git a/addons/rds-chart/values.yaml b/addons/rds-chart/values.yaml
index e8c4edd68..1010e5cc3 100644
--- a/addons/rds-chart/values.yaml
+++ b/addons/rds-chart/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: public.ecr.aws/aws-controllers-k8s/rds-controller
-  tag: 1.1.7
+  tag: 1.1.8
   pullPolicy: IfNotPresent
   pullSecrets: []