diff --git a/library/common/1.0.0/README.md b/library/common/1.0.0/README.md
index 102c2556c4..f4615d7723 100644
--- a/library/common/1.0.0/README.md
+++ b/library/common/1.0.0/README.md
@@ -17,6 +17,7 @@
 - Containers: `$ContainerName`
 - ConfigMap: `$FullName-$ConfigMapName`
 - Secret: `$FullName-$SecretName`
+- Scale Certificate: `$FullName-$CertName`
 - Scale External Interface: `ix-$ReleaseName-$index`
 
 > Full name -> `$ReleaseName-$ChartName`
diff --git a/library/common/1.0.0/docs/scaleCertificates.md b/library/common/1.0.0/docs/scaleCertificates.md
new file mode 100644
index 0000000000..9a89916bab
--- /dev/null
+++ b/library/common/1.0.0/docs/scaleCertificates.md
@@ -0,0 +1,34 @@
+# Scale Certificate
+
+| Key                                      |   Type    | Required |   Helm Template    | Default | Description                                   |
+| :--------------------------------------- | :-------: | :------: | :----------------: | :-----: | :-------------------------------------------- |
+| scaleCertificate                         |  `list`   |    ❌    |         ❌         |  `{}`   | Define the certificate as dicts               |
+| scaleCertificate.[cert-name].enabled     | `boolean` |    ✅    |         ❌         | `false` | Enables the certificate (The secret creation) |
+| scaleCertificate.[cert-name].labels      |  `dict`   |    ❌    | ✅ (On value only) |  `{}`   | Additional labels for secret                  |
+| scaleCertificate.[cert-name].annotations |  `dict`   |    ❌    | ✅ (On value only) |  `{}`   | Additional annotations for secret             |
+| scaleCertificate.[cert-name].id          | `string`  |    ✅    |         ❌         |  `""`   | ID of the certificate in ixCertificates       |
+
+---
+
+Appears in:
+
+- `.Values.scaleCertificate`
+
+---
+
+Naming scheme:
+
+- `$FullName-$CertName` (release-name-chart-name-CertName)
+
+---
+
+Examples:
+
+```yaml
+scaleCertificate:
+  cert-name:
+    enabled: false
+    labels: {}
+    annotations: {}
+    id: 1
+```
diff --git a/library/common/1.0.0/templates/spawner/_certificate.tpl b/library/common/1.0.0/templates/spawner/_certificate.tpl
index 212229fdec..afd9b82fbb 100644
--- a/library/common/1.0.0/templates/spawner/_certificate.tpl
+++ b/library/common/1.0.0/templates/spawner/_certificate.tpl
@@ -22,8 +22,6 @@
       {{- $data := fromJson (include "ix.v1.common.lib.certificate.getData" (dict "rootCtx" $ "objectData" $objectData)) -}}
       {{- $_ := set $objectData "data" $data -}}
 
-      {{/* TODO: Create persistence if defined */}}
-
       {{/* Set the type to certificate */}}
       {{- $_ := set $objectData "type" "certificate" -}}