diff --git a/CHANGELOG.md b/CHANGELOG.md
index 714963f..03d0369 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,7 @@
 
 ### Changed
 
-- Added extractionAlgorithm property for Extractor
-- Added faceTemplateCompatibilityVersion property to validate templates versions
+- Added extractionAlgorithm and compatibilityVersion for face templates
 
 ## [v0.8.7]
 
diff --git a/README.md b/README.md
index b12214a..f0fad07 100644
--- a/README.md
+++ b/README.md
@@ -332,7 +332,8 @@ metadata:
 | configurations.apiAuth.oauthTokenUrl | string | `""` | used only for enabling OAuth flows in swagger UI |
 | configurations.database.connectionStringKey | string | `"cs"` | key within the existing secret which contains the connection string, see https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/connection-strings |
 | configurations.database.existingSecretName | string | `"db-cs"` | connection string needs to be provided as a dependency of the chart |
-| configurations.faceTemplateCompatibilityVersion | string | `nil` |  |
+| configurations.facetemplate.compatibilityVersion | string | `nil` |  |
+| configurations.facetemplate.extractionAlgorithm | string | `nil` |  |
 | configurations.license.mountPath | string | `"/etc/innovatrics"` |  |
 | configurations.license.secretName | string | `"iface-lic"` |  |
 | configurations.license.volumeMountName | string | `"license"` |  |
@@ -438,7 +439,6 @@ metadata:
 | edgeStreamsStateSync.tolerations | list | `[]` |  |
 | experimentalFeatures.qr.enabled | bool | `false` | enable qr modality |
 | extractor.annotations | object | `{}` | Annotations for extractor deployment |
-| extractor.extractionAlgorithm | string | `nil` |  |
 | extractor.image.digest | string | `nil` | Overrides the image tag with an image digest |
 | extractor.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | extractor.image.registry | string | `nil` | The Docker registry, overrides `global.image.registry` |
diff --git a/templates/_matcher.tpl b/templates/_matcher.tpl
index 173b29d..2e7a7bb 100644
--- a/templates/_matcher.tpl
+++ b/templates/_matcher.tpl
@@ -63,9 +63,9 @@ spec:
         {{- include "smartface.commonEnv" . | nindent 8 }}
         {{- include "smartface.rmqConfig" . | nindent 8 }}
         {{- include "smartface.dbConfig" . | nindent 8 }}
-        {{- if .Values.configurations.faceTemplateCompatibilityVersion  }}
+        {{- if .Values.configurations.facetemplate.compatibilityVersion  }}
         - name: SF_FACE_TEMPLATE_COMPATIBILITY_VERSION
-          value: {{ .Values.configurations.faceTemplateCompatibilityVersion | quote }}
+          value: {{ .Values.configurations.facetemplate.compatibilityVersion | quote }}
         {{- end }}
         {{- with .Values.matcher.extraVars }}
         {{- toYaml . | nindent 8 }}
diff --git a/templates/edge-streams/base-deployment.yaml b/templates/edge-streams/base-deployment.yaml
index 84d4e54..494cf57 100644
--- a/templates/edge-streams/base-deployment.yaml
+++ b/templates/edge-streams/base-deployment.yaml
@@ -61,9 +61,9 @@ spec:
         {{- include "smartface.rmqConfig" . | nindent 8 }}
         {{- include "smartface.dbConfig" . | nindent 8 }}
         {{- include "smartface.s3Config" . | nindent 8 }}
-        {{- if .Values.configurations.faceTemplateCompatibilityVersion  }}
+        {{- if .Values.configurations.facetemplate.compatibilityVersion  }}
         - name: SF_FACE_TEMPLATE_COMPATIBILITY_VERSION
-          value: {{ .Values.configurations.faceTemplateCompatibilityVersion | quote }}
+          value: {{ .Values.configurations.facetemplate.compatibilityVersion | quote }}
         {{- end }}
         {{- with .Values.base.extraVars }}
         {{- toYaml . | nindent 8 }}
diff --git a/templates/edge-streams/edge-stream-processor-deployment.yaml b/templates/edge-streams/edge-stream-processor-deployment.yaml
index 05a73eb..5204d5e 100644
--- a/templates/edge-streams/edge-stream-processor-deployment.yaml
+++ b/templates/edge-streams/edge-stream-processor-deployment.yaml
@@ -59,9 +59,9 @@ spec:
         {{- include "smartface.commonEnv" . | nindent 8 }}
         {{- include "smartface.rmqConfig" . | nindent 8 }}
         {{- include "smartface.dbConfig" . | nindent 8 }}
-        {{- if .Values.configurations.faceTemplateCompatibilityVersion  }}
+        {{- if .Values.configurations.facetemplate.compatibilityVersion  }}
         - name: SF_FACE_TEMPLATE_COMPATIBILITY_VERSION
-          value: {{ .Values.configurations.faceTemplateCompatibilityVersion | quote }}
+          value: {{ .Values.configurations.facetemplate.compatibilityVersion | quote }}
         {{- end }}
         {{- with .Values.edgeStreamProcessor.extraVars }}
         {{- toYaml . | nindent 8 }}
diff --git a/templates/edge-streams/face-matcher-deployment.yaml b/templates/edge-streams/face-matcher-deployment.yaml
index cf48e44..4e2a4d5 100644
--- a/templates/edge-streams/face-matcher-deployment.yaml
+++ b/templates/edge-streams/face-matcher-deployment.yaml
@@ -59,9 +59,9 @@ spec:
         {{- include "smartface.commonEnv" . | nindent 8 }}
         {{- include "smartface.rmqConfig" . | nindent 8 }}
         {{- include "smartface.dbConfig" . | nindent 8 }}
-        {{- if .Values.configurations.faceTemplateCompatibilityVersion  }}
+        {{- if .Values.configurations.facetemplate.compatibilityVersion  }}
         - name: SF_FACE_TEMPLATE_COMPATIBILITY_VERSION
-          value: {{ .Values.configurations.faceTemplateCompatibilityVersion | quote }}
+          value: {{ .Values.configurations.facetemplate.compatibilityVersion | quote }}
         {{- end }}
         {{- with .Values.faceMatcher.extraVars }}
         {{- toYaml . | nindent 8 }}
diff --git a/templates/extractor-deployment.yaml b/templates/extractor-deployment.yaml
index a8dadcb..7bc34b5 100644
--- a/templates/extractor-deployment.yaml
+++ b/templates/extractor-deployment.yaml
@@ -59,9 +59,9 @@ spec:
         env:
         {{- include "smartface.commonEnv" . | nindent 8 }}
         {{- include "smartface.rmqConfig" . | nindent 8 }}
-        {{- if .Values.extractor.extractionAlgorithm  }}
+        {{- if .Values.configurations.facetemplate.extractionAlgorithm  }}
         - name: Extraction__Algorithm
-          value: {{ .Values.extractor.extractionAlgorithm | quote }}
+          value: {{ .Values.configurations.facetemplate.extractionAlgorithm | quote }}
         {{- end }}
         {{- with .Values.extractor.extraVars }}
         {{- toYaml . | nindent 8 }}
diff --git a/values.yaml b/values.yaml
index 4169016..771f50a 100644
--- a/values.yaml
+++ b/values.yaml
@@ -76,7 +76,9 @@ configurations:
   # Example of possible values: 1.40, 1.39
   # It is specifically intended for use during the process of migrating templates
   # Use this setting with caution, becouse it can break functionality
-  faceTemplateCompatibilityVersion: null
+  facetemplate:
+    compatibilityVersion: null
+    extractionAlgorithm: null
 
 features:
   multitenancy:
@@ -503,11 +505,6 @@ extractor:
     digest: null
     # -- Docker image pull policy
     pullPolicy: IfNotPresent
-  # If the extractionAlgorithm value is null, the default algorithm is used.
-  # Possible values for this property are "accurate_mask" and "balanced".
-  # It is specifically intended for use during the process of migrating templates
-  # Use this setting with caution, becouse it can break functionality
-  extractionAlgorithm: null
   # --  Additional environment variables for the extractor component
   # extraVars:
   #  - name: EXTRA_VAR1