diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
index 19e410ad65c939f4a976035c940171c1209bef9c..af85a6b93fcf9934e97dfc127e9e4d1dd410b4e9 100644
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: webmonitorx-ingress
-version: 4.8.6
+version: 4.8.7
 appVersion: 4.8.1-4
 home: https://wmx-public.gitlab.yandexcloud.net/wmx-public/ingress
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer with Webmonitorx module
diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
index c2392cd85754b5cc14f8fc7e10aa13dfbf8010eb..a495f8e2e547205dea723d994064ab610053a6b5 100644
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@@ -256,9 +256,9 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wallarmInitContainer.addNode" -}}
 - name: addnode
-{{- if .Values.controller.wallarm.addnode.image }}
+{{- if and .Values.controller.wallarm.addnode .Values.controller.wallarm.addnode.image }}
   {{- with .Values.controller.wallarm.addnode.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
@@ -296,9 +296,9 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxAppstructureContainer" -}}
 - name: appstructure
-{{- if .Values.controller.wallarm.appstructure.image }}
+{{- if and .Values.controller.wallarm.appstructure .Values.controller.wallarm.appstructure.image }}
   {{- with .Values.controller.wallarm.appstructure.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
@@ -328,14 +328,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxBruteDetectContainer" -}}
 - name: brute-detect
-{{- if .Values.controller.wallarm.bruteDetect.image }}
+{{- if and .Values.controller.wallarm.bruteDetect .Values.controller.wallarm.bruteDetect.image }}
   {{- with .Values.controller.wallarm.bruteDetect.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/brute-detect_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/brute-detect_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -351,14 +351,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxCollectdContainer" -}}
 - name: collectd
-{{- if .Values.controller.wallarm.collectd.image }}
+{{- if and .Values.controller.wallarm.collectd .Values.controller.wallarm.collectd.image }}
   {{- with .Values.controller.wallarm.collectd.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/collectd_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/collectd_ep.sh"]
   env:
   - name: PYTHONPATH
     value: /opt/wallarm/usr/lib/python3.9
@@ -380,14 +380,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxCookiesMonContainer" -}}
 - name: cookies-monitoring
-{{- if .Values.controller.wallarm.cookiesMonitoring.image }}
+{{- if and .Values.controller.wallarm.cookiesMonitoring .Values.controller.wallarm.cookiesMonitoring.image }}
   {{- with .Values.controller.wallarm.cookiesMonitoring.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/cookies-monitoring_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/cookies-monitoring_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -403,14 +403,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxExportAttacksContainer" -}}
 - name: export-attacks
-{{- if .Values.controller.wallarm.exportAttacks.image }}
+{{- if and .Values.controller.wallarm.exportAttacks .Values.controller.wallarm.exportAttacks.image }}
   {{- with .Values.controller.wallarm.exportAttacks.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/export-attacks_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/export-attacks_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -426,14 +426,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxExportCountersContainer" -}}
 - name: export-counters
-{{- if .Values.controller.wallarm.exportCounters.image }}
+{{- if and .Values.controller.wallarm.exportCounters .Values.controller.wallarm.exportCounters.image }}
   {{- with .Values.controller.wallarm.exportCounters.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/export-counters_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/export-counters_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -449,14 +449,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxExportEnvironmentContainer" -}}
 - name: export-environment
-{{- if .Values.controller.wallarm.exportEnvironment.image }}
+{{- if and .Values.controller.wallarm.exportEnvironment .Values.controller.wallarm.exportEnvironment.image }}
   {{- with .Values.controller.wallarm.exportEnvironment.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/export-environment_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/export-environment_ep.sh"]
   env:
   {{/* WALLARM_INGRESS_CONTROLLER_VERSION is required to export controller version for comparsion with pkg_version data */}}
   - name: WALLARM_INGRESS_CONTROLLER_VERSION
@@ -475,14 +475,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxExportMetricssContainer" -}}
 - name: export-metrics
-{{- if .Values.controller.wallarm.exportMetrics.image }}
+{{- if and .Values.controller.wallarm.exportMetrics .Values.controller.wallarm.exportMetrics.image }}
   {{- with .Values.controller.wallarm.exportMetrics.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/export-metrics_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/export-metrics_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -498,14 +498,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxSyncIpListsSourceContainer" -}}
 - name: sync-ip-lists-source
-{{- if .Values.controller.wallarm.syncIpListsSource.image }}
+{{- if and .Values.controller.wallarm.syncIpListsSource .Values.controller.wallarm.syncIpListsSource.image }}
   {{- with .Values.controller.wallarm.syncIpListsSource.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/sync-ip-lists-source_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/sync-ip-lists-source_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -521,14 +521,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxSyncIpListsContainer" -}}
 - name: sync-ip-list
-{{- if .Values.controller.wallarm.syncIpLists.image }}
+{{- if and .Values.controller.wallarm.syncIpLists .Values.controller.wallarm.syncIpLists.image }}
   {{- with .Values.controller.wallarm.syncIpLists.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/sync-ip-lists_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/sync-ip-lists_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -544,14 +544,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxSyncMarkersContainer" -}}
 - name: sync-markers
-{{- if .Values.controller.wallarm.syncMarkers.image }}
+{{- if and .Values.controller.wallarm.syncMarkers .Values.controller.wallarm.syncMarkers.image }}
   {{- with .Values.controller.wallarm.syncMarkers.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/sync-markers_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/sync-markers_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -567,14 +567,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxSyncNodeContainer" -}}
 - name: syncnode
-{{- if .Values.controller.wallarm.syncNode.image }}
+{{- if and .Values.controller.wallarm.syncNode .Values.controller.wallarm.syncNode.image }}
   {{- with .Values.controller.wallarm.syncNode.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/syncnode_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/syncnode_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
@@ -590,14 +590,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxTarantoolContainer" -}}
 - name: tarantool
-{{- if .Values.controller.wallarm.tarantool.image }}
+{{- if and .Values.controller.wallarm.tarantool .Values.controller.wallarm.tarantool.image }}
   {{- with .Values.controller.wallarm.tarantool.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/tarantool_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/tarantool_ep.sh"]
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
   env:
   {{- include "ingress-nginx.commonEnvVars" . | nindent 2 }}
@@ -637,14 +637,14 @@ readOnlyRootFilesystem: false
 
 {{- define "ingress-nginx.wmxWeakJWTDetectContainer" -}}
 - name: weak-jwt-detect
-{{- if .Values.controller.wallarm.weakJwtDetect.image }}
+{{- if and .Values.controller.wallarm.weakJwtDetect .Values.controller.wallarm.weakJwtDetect.image }}
   {{- with .Values.controller.wallarm.weakJwtDetect.image }}
-  image: "{{ .repository }}:{{ .tag }}"
+  image: {{ .registry }}/{{ .image }}:{{ .tag }}
   {{- end }}
 {{- else }}
   image: "wmx-public.gitlab.yandexcloud.net:5050/wmx-public/container-images/ingress-wmx:{{ .Values.controller.image.tag }}"
-  command: ["/opt/wallarm/weak-jwt-detect_ep.sh"]
 {{- end }}
+  command: ["/opt/wallarm/weak-jwt-detect_ep.sh"]
   env:
   {{- include "ingress-nginx.rubyEnvVars" . | nindent 2 }}
   imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index 5f803bb8e323e1a6ead5a86aa6e7ed5905e60579..1f18935903d7f428d78b8a8452b7651f9f53ea07 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -952,6 +952,11 @@ controller:
     fallback: "on"
     tarantool:
       kind: Deployment
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       service:
         annotations: {}
       replicaCount: 1
@@ -992,46 +997,102 @@ controller:
     ## If HPA is used, the resources.requests.{cpu,memory} must be set in the following variables.
     ## Means that in case of values changing - BOTH pods (controller and tarantool) will be redeployed.
     addnode:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     appstructure:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     bruteDetect:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     collectd:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     cookiesMonitoring:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     exportAttacks:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     exportCounters:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     exportEnvironment:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     exportMetrics:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     syncIpListsSource:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     syncIpLists:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     syncMarkers:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     syncNode:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
     weakJwtDetect:
-      image: ""
+      image: {}
+      # image:
+      #   registry: wmx-public.gitlab.yandexcloud.net:5050
+      #   image: wmx-public/container-images/ingress-wmx
+      #   tag: 4.8.1-4
       resources: {}
 
 # -- Rollback limit