diff --git a/controllers/common.go b/controllers/common.go
index eed81c286..a1de0cc14 100644
--- a/controllers/common.go
+++ b/controllers/common.go
@@ -418,6 +418,7 @@ func (r *ReconcilerBase) generateConfigsGeneric(
 			CustomData:         extraData,
 			Annotations:        map[string]string{},
 			AdditionalTemplate: extraTemplates,
+			PostRenderCleanup:  true,
 		},
 	}
 	if withScripts {
diff --git a/controllers/nova_controller.go b/controllers/nova_controller.go
index dd0844f79..49f3f50c0 100644
--- a/controllers/nova_controller.go
+++ b/controllers/nova_controller.go
@@ -1705,12 +1705,13 @@ func (r *NovaReconciler) ensureTopLevelSecret(
 	)
 
 	template := util.Template{
-		Name:         secretName,
-		Namespace:    instance.Namespace,
-		Type:         util.TemplateTypeNone,
-		InstanceType: instance.GetObjectKind().GroupVersionKind().Kind,
-		Labels:       labels,
-		CustomData:   data,
+		Name:              secretName,
+		Namespace:         instance.Namespace,
+		Type:              util.TemplateTypeNone,
+		InstanceType:      instance.GetObjectKind().GroupVersionKind().Kind,
+		Labels:            labels,
+		CustomData:        data,
+		PostRenderCleanup: true,
 	}
 
 	err := secret.EnsureSecrets(ctx, h, instance, []util.Template{template}, nil)
diff --git a/controllers/novametadata_controller.go b/controllers/novametadata_controller.go
index 75f4d3919..c93c9689f 100644
--- a/controllers/novametadata_controller.go
+++ b/controllers/novametadata_controller.go
@@ -826,6 +826,7 @@ func (r *NovaMetadataReconciler) generateNeutronConfigs(
 			ConfigOptions:      templateParameters,
 			Labels:             labels,
 			AdditionalTemplate: templates,
+			PostRenderCleanup:  true,
 		},
 	}