diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e57d1c54a..ab70c29a9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: check-yaml
         args:
           - --allow-multiple-documents
-        exclude: "mkdocs.yml"
+        exclude: "mkdocs.yml|^charts/argocd-understack/templates/"
       - id: check-yaml
         name: check-yaml-mkdocs
         # --unsafe is a workaround for the use of !! in mkdocs.yml
diff --git a/.yamllint.yaml b/.yamllint.yaml
index 7556021ae..817d4c659 100644
--- a/.yamllint.yaml
+++ b/.yamllint.yaml
@@ -2,6 +2,7 @@ extends: default
 
 ignore:
   - components/etcdbackup/templates/
+  - charts/argocd-understack/templates/
 
 rules:
   comments:
diff --git a/charts/argocd-understack/README.md b/charts/argocd-understack/README.md
index e23921f23..6d52cdda3 100644
--- a/charts/argocd-understack/README.md
+++ b/charts/argocd-understack/README.md
@@ -230,7 +230,7 @@ diff expected.yaml current.yaml
 
 ### Adding a New Component
 
-1. Create template in `templates/application-<component>.yaml.tpl`
+1. Create template in `templates/application-<component>.yaml`
 2. Add configuration to `values.yaml` under appropriate section
 3. Update this README
 
diff --git a/charts/argocd-understack/templates/application-argo-events-workflows.yaml.tpl b/charts/argocd-understack/templates/application-argo-events-workflows.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-argo-events-workflows.yaml.tpl
rename to charts/argocd-understack/templates/application-argo-events-workflows.yaml
diff --git a/charts/argocd-understack/templates/application-argo-events.yaml.tpl b/charts/argocd-understack/templates/application-argo-events.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-argo-events.yaml.tpl
rename to charts/argocd-understack/templates/application-argo-events.yaml
diff --git a/charts/argocd-understack/templates/application-argo-workflows.yaml.tpl b/charts/argocd-understack/templates/application-argo-workflows.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-argo-workflows.yaml.tpl
rename to charts/argocd-understack/templates/application-argo-workflows.yaml
diff --git a/charts/argocd-understack/templates/application-cert-manager.yaml.tpl b/charts/argocd-understack/templates/application-cert-manager.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-cert-manager.yaml.tpl
rename to charts/argocd-understack/templates/application-cert-manager.yaml
diff --git a/charts/argocd-understack/templates/application-chrony.yaml.tpl b/charts/argocd-understack/templates/application-chrony.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-chrony.yaml.tpl
rename to charts/argocd-understack/templates/application-chrony.yaml
diff --git a/charts/argocd-understack/templates/application-cilium.yaml.tpl b/charts/argocd-understack/templates/application-cilium.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-cilium.yaml.tpl
rename to charts/argocd-understack/templates/application-cilium.yaml
diff --git a/charts/argocd-understack/templates/application-cnpg-system.yaml.tpl b/charts/argocd-understack/templates/application-cnpg-system.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-cnpg-system.yaml.tpl
rename to charts/argocd-understack/templates/application-cnpg-system.yaml
diff --git a/charts/argocd-understack/templates/application-dex.yaml.tpl b/charts/argocd-understack/templates/application-dex.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-dex.yaml.tpl
rename to charts/argocd-understack/templates/application-dex.yaml
diff --git a/charts/argocd-understack/templates/application-envoy-configs.yaml.tpl b/charts/argocd-understack/templates/application-envoy-configs.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-envoy-configs.yaml.tpl
rename to charts/argocd-understack/templates/application-envoy-configs.yaml
diff --git a/charts/argocd-understack/templates/application-envoy-gateway.yaml.tpl b/charts/argocd-understack/templates/application-envoy-gateway.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-envoy-gateway.yaml.tpl
rename to charts/argocd-understack/templates/application-envoy-gateway.yaml
diff --git a/charts/argocd-understack/templates/application-etcdbackup.yaml.tpl b/charts/argocd-understack/templates/application-etcdbackup.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-etcdbackup.yaml.tpl
rename to charts/argocd-understack/templates/application-etcdbackup.yaml
diff --git a/charts/argocd-understack/templates/application-external-dns.yaml.tpl b/charts/argocd-understack/templates/application-external-dns.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-external-dns.yaml.tpl
rename to charts/argocd-understack/templates/application-external-dns.yaml
diff --git a/charts/argocd-understack/templates/application-external-secrets.yaml.tpl b/charts/argocd-understack/templates/application-external-secrets.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-external-secrets.yaml.tpl
rename to charts/argocd-understack/templates/application-external-secrets.yaml
diff --git a/charts/argocd-understack/templates/application-global-workflows.yaml.tpl b/charts/argocd-understack/templates/application-global-workflows.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-global-workflows.yaml.tpl
rename to charts/argocd-understack/templates/application-global-workflows.yaml
diff --git a/charts/argocd-understack/templates/application-ingress-nginx.yaml.tpl b/charts/argocd-understack/templates/application-ingress-nginx.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-ingress-nginx.yaml.tpl
rename to charts/argocd-understack/templates/application-ingress-nginx.yaml
diff --git a/charts/argocd-understack/templates/application-mariadb-operator.yaml.tpl b/charts/argocd-understack/templates/application-mariadb-operator.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-mariadb-operator.yaml.tpl
rename to charts/argocd-understack/templates/application-mariadb-operator.yaml
diff --git a/charts/argocd-understack/templates/application-monitoring.tpl b/charts/argocd-understack/templates/application-monitoring.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-monitoring.tpl
rename to charts/argocd-understack/templates/application-monitoring.yaml
diff --git a/charts/argocd-understack/templates/application-nautobot-site.yaml.tpl b/charts/argocd-understack/templates/application-nautobot-site.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-nautobot-site.yaml.tpl
rename to charts/argocd-understack/templates/application-nautobot-site.yaml
diff --git a/charts/argocd-understack/templates/application-nautobot.yaml.tpl b/charts/argocd-understack/templates/application-nautobot.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-nautobot.yaml.tpl
rename to charts/argocd-understack/templates/application-nautobot.yaml
diff --git a/charts/argocd-understack/templates/application-nautobotop.yaml.tpl b/charts/argocd-understack/templates/application-nautobotop.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-nautobotop.yaml.tpl
rename to charts/argocd-understack/templates/application-nautobotop.yaml
diff --git a/charts/argocd-understack/templates/application-openebs.yaml.tpl b/charts/argocd-understack/templates/application-openebs.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openebs.yaml.tpl
rename to charts/argocd-understack/templates/application-openebs.yaml
diff --git a/charts/argocd-understack/templates/application-openstack-exporter.yaml.tpl b/charts/argocd-understack/templates/application-openstack-exporter.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openstack-exporter.yaml.tpl
rename to charts/argocd-understack/templates/application-openstack-exporter.yaml
diff --git a/charts/argocd-understack/templates/application-openstack-helm.yaml.tpl b/charts/argocd-understack/templates/application-openstack-helm.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openstack-helm.yaml.tpl
rename to charts/argocd-understack/templates/application-openstack-helm.yaml
diff --git a/charts/argocd-understack/templates/application-openstack-memcached.yaml.tpl b/charts/argocd-understack/templates/application-openstack-memcached.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openstack-memcached.yaml.tpl
rename to charts/argocd-understack/templates/application-openstack-memcached.yaml
diff --git a/charts/argocd-understack/templates/application-openstack-resource-controller.yaml.tpl b/charts/argocd-understack/templates/application-openstack-resource-controller.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openstack-resource-controller.yaml.tpl
rename to charts/argocd-understack/templates/application-openstack-resource-controller.yaml
diff --git a/charts/argocd-understack/templates/application-openstack.yaml.tpl b/charts/argocd-understack/templates/application-openstack.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openstack.yaml.tpl
rename to charts/argocd-understack/templates/application-openstack.yaml
diff --git a/charts/argocd-understack/templates/application-opentelemetry-operator.yaml.tpl b/charts/argocd-understack/templates/application-opentelemetry-operator.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-opentelemetry-operator.yaml.tpl
rename to charts/argocd-understack/templates/application-opentelemetry-operator.yaml
diff --git a/charts/argocd-understack/templates/application-openvswitch.yaml.tpl b/charts/argocd-understack/templates/application-openvswitch.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-openvswitch.yaml.tpl
rename to charts/argocd-understack/templates/application-openvswitch.yaml
diff --git a/charts/argocd-understack/templates/application-otel-collector.yaml.tpl b/charts/argocd-understack/templates/application-otel-collector.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-otel-collector.yaml.tpl
rename to charts/argocd-understack/templates/application-otel-collector.yaml
diff --git a/charts/argocd-understack/templates/application-ovn.yaml.tpl b/charts/argocd-understack/templates/application-ovn.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-ovn.yaml.tpl
rename to charts/argocd-understack/templates/application-ovn.yaml
diff --git a/charts/argocd-understack/templates/application-rabbitmq-system.yaml.tpl b/charts/argocd-understack/templates/application-rabbitmq-system.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-rabbitmq-system.yaml.tpl
rename to charts/argocd-understack/templates/application-rabbitmq-system.yaml
diff --git a/charts/argocd-understack/templates/application-rook.yaml.tpl b/charts/argocd-understack/templates/application-rook.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-rook.yaml.tpl
rename to charts/argocd-understack/templates/application-rook.yaml
diff --git a/charts/argocd-understack/templates/application-sealed-secrets.yaml.tpl b/charts/argocd-understack/templates/application-sealed-secrets.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-sealed-secrets.yaml.tpl
rename to charts/argocd-understack/templates/application-sealed-secrets.yaml
diff --git a/charts/argocd-understack/templates/application-site-workflows.yaml.tpl b/charts/argocd-understack/templates/application-site-workflows.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-site-workflows.yaml.tpl
rename to charts/argocd-understack/templates/application-site-workflows.yaml
diff --git a/charts/argocd-understack/templates/application-snmp-exporter.yaml.tpl b/charts/argocd-understack/templates/application-snmp-exporter.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-snmp-exporter.yaml.tpl
rename to charts/argocd-understack/templates/application-snmp-exporter.yaml
diff --git a/charts/argocd-understack/templates/application-understack-cluster-issuer.yaml.tpl b/charts/argocd-understack/templates/application-understack-cluster-issuer.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-understack-cluster-issuer.yaml.tpl
rename to charts/argocd-understack/templates/application-understack-cluster-issuer.yaml
diff --git a/charts/argocd-understack/templates/application-undersync.yaml.tpl b/charts/argocd-understack/templates/application-undersync.yaml
similarity index 100%
rename from charts/argocd-understack/templates/application-undersync.yaml.tpl
rename to charts/argocd-understack/templates/application-undersync.yaml