diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 7625d37..498d013 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,66 +1,105 @@
 parameters:
   _param:
+    # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1650474694302
+    docker_image_alerta_tag: "2019.2.19"
+    docker_image_alertmanager_tag: "2019.2.21"
+    docker_image_aptly_base_tag: "2019.2.19"
+    docker_image_aptly_public_tag: "2019.2.19"
+    docker_image_aptly_publisher_tag: "2019.2.19"
+    docker_image_cockroachdb_tag: "v2.1.1"
+    docker_image_compose_tag: "1.17.1"
+    docker_image_cvp_rally_tag: "2019.2.5"
+    docker_image_cvp_sanity_checks_tag: "2019.2.21"
+    docker_image_cvp_shaker_checks_tag: "2019.2.14"
+    docker_image_cvp_tempest_tag: "${_param:openstack_version}"
+    docker_image_cvp_xrally_tag: "0.11.2"
+    docker_image_gerrit_tag: "2019.2.11"
+    docker_image_grafana_tag: "2019.2.19"
+    docker_image_jenkins_jnlp_slave_tag: "2019.2.19"
+    docker_image_jenkins_ssh_slave_tag: "2019.2.20"
+    docker_image_jenkins_tag: "2019.2.19"
+    docker_image_keycloak_proxy_tag: "3.4.2.Final"
+    docker_image_keycloak_server_tag: "4.5.0.Final"
+    docker_image_mongodb_tag: "2019.2.6"
+    docker_image_mysql_tag: "2019.2.21"
+    docker_image_openldap_tag: "2019.2.19"
+    docker_image_operations_api_tag: "2019.2.6"
+    docker_image_operations_ui_tag: "2019.2.6"
+    docker_image_phpldapadmin_tag: "2019.2.21"
+    docker_image_postgresql_tag: "9.6.24-alpine"
+    # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20220420134722
+    docker_image_prometheus_es_exporter_tag: "2019.2.19"
+    docker_image_prometheus_gainsight_elasticsearch_tag: "2019.2.6"
+    # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220823042322
+    docker_image_prometheus_gainsight_tag: "2019.2.21"
+    docker_image_prometheus_relay_tag: "2019.2.11"
+    docker_image_prometheus_tag: "2019.2.14"
+    docker_image_pushgateway_tag: "2019.2.14"
+    docker_image_registry_tag: "2019.2.6"
+    # docker-kaas-local.artifactory.mirantis.com/stacklight/telegraf:v1.9.1-20210225142050
+    docker_image_remote_agent_tag: "2019.2.17"
+    docker_image_remote_collector_tag: "2019.2.6"
+    docker_image_remote_storage_adapter_tag: "2019.2.6"
+    # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20220420134728
+    docker_image_sf_notifier_tag: "2019.2.19"
+    docker_image_visualizer_tag: "2019.2.6"
+
+    opencontrail_docker_image_tag: "2019.2.14"
     # CI\CD
-    docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/docker/compose:1.17.1"
+    docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/docker/compose:${_param:docker_image_compose_tag}"
     # 2.6.2 version, from 12/18/2108, differ from latest 2.6.2 upstream - update next cycle
-    docker_image_registry:   "${_param:mcp_docker_registry}/mirantis/external/registry:2019.2.6"
-    docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:2019.2.6"
-    docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:2019.2.19"
-    docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.22-alpine"
+    docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:docker_image_registry_tag}"
+    docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:docker_image_visualizer_tag}"
+    docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/cicd/openldap:${_param:docker_image_openldap_tag}"
+    docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:docker_image_postgresql_tag}"
     # 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
-    docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:2019.2.6"
+    docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:${_param:docker_image_mongodb_tag}"
     ###
     # phpldapadmin:0.9.0
-    docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:2019.2.20"
+    docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:docker_image_phpldapadmin_tag}"
     # gerrit:2.15.18
-    docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:2019.2.11"
+    docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:docker_image_gerrit_tag}"
     # mysql:5.6.51
-    docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:2019.2.20"
+    docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:docker_image_mysql_tag}"
     # jenkins:2.263.4
-    docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.19"
-    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:2019.2.19"
+    docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:${_param:docker_image_jenkins_tag}"
+    docker_image_jenkins_jnlp_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:docker_image_jenkins_jnlp_slave_tag}"
     # TODO: fix tag
-    docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:2019.2.20"
+    docker_image_jenkins_ssh_slave: "${_param:mcp_docker_registry}/mirantis/cicd/ssh-slave:${_param:docker_image_jenkins_ssh_slave_tag}"
     # model-generator
-    docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:2019.2.6"
-    docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:2019.2.6"
-    # OpenContrail
-    opencontrail_docker_image_tag: "2019.2.14"
+    docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:docker_image_operations_api_tag}"
+    docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:${_param:docker_image_operations_ui_tag}"
     # stacklight
-    # docker-prod-local.docker.mirantis.net/mcp/alerta:7.4.4-xenial-1650474694302
-    docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:2019.2.19"
-    docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:2019.2.14"
-    docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:2019.2.19"
-    # docker-dev-kaas-local.docker.mirantis.net/stacklight/prometheus-es-exporter:v0.14.0-20220420134722
-    docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:2019.2.19"
-    docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:2019.2.14"
-    # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-reporter:v0.1-20220622101204
-    docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:2019.2.20"
-    docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:2019.2.6"
-    docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:2019.2.11"
-    docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:2019.2.14"
-    # docker-kaas-local.artifactory.mirantis.com/stacklight/telegraf:v1.9.1-20210225142050
-    docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:2019.2.17"
-    docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:2019.2.6"
-    docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:2019.2.6"
-    # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20220420134728
-    docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:2019.2.19"
+    docker_image_alerta: "${_param:mcp_docker_registry}/openstack-docker/alerta:${_param:docker_image_alerta_tag}"
+    docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:${_param:docker_image_alertmanager_tag}"
+    docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:docker_image_grafana_tag}"
+    docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/openstack-docker/prometheus-es-exporter:${_param:docker_image_prometheus_es_exporter_tag}"
+    docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:docker_image_prometheus_tag}"
+    docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/sf-reporter:${_param:docker_image_prometheus_gainsight_tag}"
+    docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:docker_image_prometheus_gainsight_elasticsearch_tag}"
+    docker_image_prometheus_relay: "${_param:mcp_docker_registry}/openstack-docker/prometheus-relay:${_param:docker_image_prometheus_relay_tag}"
+    docker_image_pushgateway: "${_param:mcp_docker_registry}/openstack-docker/pushgateway:${_param:docker_image_pushgateway_tag}"
+    docker_image_remote_agent: "${_param:mcp_docker_registry}/openstack-docker/telegraf:${_param:docker_image_remote_agent_tag}"
+    docker_image_remote_collector: "${_param:mcp_docker_registry}/openstack-docker/heka:${_param:docker_image_remote_collector_tag}"
+    docker_image_remote_storage_adapter: "${_param:mcp_docker_registry}/openstack-docker/remote_storage_adapter:${_param:docker_image_remote_storage_adapter_tag}"
+    # docker-dev-kaas-local.docker.mirantis.net/stacklight/sf-notifier:v0.3-20220203185858
+    docker_image_sf_notifier: "${_param:mcp_docker_registry}/openstack-docker/sf-notifier:${_param:docker_image_sf_notifier_tag}"
     ##
-    docker_image_cockroachdb: "${_param:mcp_docker_registry}/mirantis/external/cockroach/cockroach:v2.1.1"
+    docker_image_cockroachdb: "${_param:mcp_docker_registry}/mirantis/external/cockroach/cockroach:${_param:docker_image_cockroachdb_tag}"
     # keycloak
-    docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
-    docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
+    docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:${_param:docker_image_keycloak_server_tag}"
+    docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:${_param:docker_image_keycloak_proxy_tag}"
     # CVP
-    docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.19"
-    docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
-    docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.14"
-    docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
-    docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:0.11.2"
+    docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:docker_image_cvp_sanity_checks_tag}"
+    docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:docker_image_cvp_tempest_tag}"
+    docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:${_param:docker_image_cvp_shaker_checks_tag}"
+    docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:${_param:docker_image_cvp_rally_tag}"
+    docker_image_cvp_xrally: "${_param:mcp_docker_registry}/mirantis/external/xrally/xrally-openstack:${_param:docker_image_cvp_xrally_tag}"
     # aptly
     docker_image_aptly:
-      base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:2019.2.19"
-      public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:2019.2.19"
-      publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:2019.2.19"
+      base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:docker_image_aptly_base_tag}"
+      public: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-public:${_param:docker_image_aptly_public_tag}"
+      publisher: "${_param:mcp_docker_registry}/mirantis/cicd/aptly-publisher:${_param:docker_image_aptly_publisher_tag}"
 
     # List of images, to be placed into offline image, during separate image build process
     # WARNING: registry|target_registry and names - must be exactly same as list above!
@@ -71,94 +110,94 @@
          # CI/CD
         - registry: ${_param:mcp_docker_registry}/mirantis/external
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
-          name: registry:2019.2.6
+          name: registry:${_param:docker_image_registry_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
-          name: visualizer:2019.2.6
+          name: visualizer:${_param:docker_image_visualizer_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/docker
-          name: compose:1.17.1
+          name: compose:${_param:docker_image_compose_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: openldap:2019.2.19
+          name: openldap:${_param:docker_image_openldap_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/library
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
-          name: postgres:9.6.22-alpine
+          name: postgres:${_param:docker_image_postgresql_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: phpldapadmin:2019.2.20
+          name: phpldapadmin:${_param:docker_image_phpldapadmin_tag}
 
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly:2019.2.19
+          name: aptly:${_param:docker_image_aptly_base_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly-public:2019.2.19
+          name: aptly-public:${_param:docker_image_aptly_public_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: aptly-publisher:2019.2.19
+          name: aptly-publisher:${_param:docker_image_aptly_publisher_tag}
 
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: jnlp-slave:2019.2.19
+          name: jnlp-slave:${_param:docker_image_jenkins_jnlp_slave_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: ssh-slave:2019.2.20
+          name: ssh-slave:${_param:docker_image_jenkins_ssh_slave_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: jenkins:2019.2.19
+          name: jenkins:${_param:docker_image_jenkins_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: gerrit:2019.2.11
+          name: gerrit:${_param:docker_image_gerrit_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/cockroach
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/cockroach
-          name: cockroach:v2.1.1
+          name: cockroach:${_param:docker_image_cockroachdb_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/jboss
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/jboss
-          name: keycloak:4.5.0.Final
+          name: keycloak:${_param:docker_image_keycloak_server_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/jboss
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/jboss
-          name: keycloak:3.4.2.Final
+          name: keycloak:${_param:docker_image_keycloak_proxy_tag}
           # stacklight
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: alertmanager:2019.2.14
+          name: alertmanager:${_param:docker_image_alertmanager_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: alerta:2019.2.19
+          name: alerta:${_param:docker_image_alerta_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: pushgateway:2019.2.14
+          name: pushgateway:${_param:docker_image_pushgateway_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: prometheus:2019.2.14
+          name: prometheus:${_param:docker_image_prometheus_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: sf-reporter:2019.2.20
+          name: sf-reporter:${_param:docker_image_prometheus_gainsight_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: telegraf:2019.2.17
+          name: telegraf:${_param:docker_image_remote_agent_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: remote_storage_adapter:2019.2.6
+          name: remote_storage_adapter:${_param:docker_image_remote_storage_adapter_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: prometheus-relay:2019.2.11
+          name: prometheus-relay:${_param:docker_image_prometheus_relay_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: grafana:2019.2.19
+          name: grafana:${_param:docker_image_grafana_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: heka:2019.2.6
+          name: heka:${_param:docker_image_remote_collector_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: sf-notifier:2019.2.19
+          name: sf-notifier:${_param:docker_image_sf_notifier_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: gainsight_elasticsearch:2019.2.6
+          name: gainsight_elasticsearch:${_param:docker_image_prometheus_gainsight_elasticsearch_tag}
         - registry: ${_param:mcp_docker_registry}/openstack-docker
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
-          name: prometheus-es-exporter:2019.2.19
+          name: prometheus-es-exporter:${_param:docker_image_prometheus_es_exporter_tag}
 
         # OpenContrail 4.1
         - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
@@ -180,20 +219,20 @@
           name: ci-tempest:queens
         - registry: ${_param:mcp_docker_registry}/mirantis/cvp
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
-          name: cvp-rally:2019.2.5
+          name: cvp-rally:${_param:docker_image_cvp_rally_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cvp
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
-          name: cvp-shaker:2019.2.14
+          name: cvp-shaker:${_param:docker_image_cvp_shaker_checks_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/cvp
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
-          name: cvp-sanity-checks:2019.2.19
+          name: cvp-sanity-checks:${_param:docker_image_cvp_sanity_checks_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
-          name: xrally-openstack:0.11.2
+          name: xrally-openstack:${_param:docker_image_cvp_xrally_tag}
           #
         - registry: ${_param:mcp_docker_registry}/mirantis/cicd
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
-          name: mysql:2019.2.20
+          name: mysql:${_param:docker_image_mysql_tag}
         - registry: ${_param:mcp_docker_registry}/mirantis/external
           target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
-          name: mongo:2019.2.6
+          name: mongo:${_param:docker_image_mongodb_tag}
diff --git a/jenkins/client/job/ceph/remove-node.yml b/jenkins/client/job/ceph/remove-node.yml
index 959cbc0..11b02d0 100644
--- a/jenkins/client/job/ceph/remove-node.yml
+++ b/jenkins/client/job/ceph/remove-node.yml
@@ -27,7 +27,7 @@
               default: salt
             HOST:
               type: string
-              description: HOST to remove from thecluster
+              description: HOST to remove from the cluster
             OSD:
               type: string
               description: Remove only those OSDs at HOST (comma-separated list or *). Leave empty if you going to remove a whole osd node. Only relevant with OSD node
diff --git a/prometheus/alertmanager/notification/alerta.yml b/prometheus/alertmanager/notification/alerta.yml
index 729aa26..bedf76d 100644
--- a/prometheus/alertmanager/notification/alerta.yml
+++ b/prometheus/alertmanager/notification/alerta.yml
@@ -16,5 +16,10 @@
             enabled: true
             webhook_configs:
               alerta:
-                url: "http://${_param:alertmanager_notification_alerta_host}:${_param:alertmanager_notification_alerta_port}/api/webhooks/prometheus?api-key=${_param:alerta_admin_key}"
+                url: "http://${_param:alertmanager_notification_alerta_host}:${_param:alertmanager_notification_alerta_port}/api/webhooks/prometheus"
                 send_resolved: true
+                http_config:
+                  basic_auth:
+                    username: ${_param:alerta_admin_username}
+                    password: ${_param:alerta_admin_password}
+