diff --git a/defaults/gerrit/init.yml b/defaults/gerrit/init.yml
index b2c59e0..2fd1bd7 100644
--- a/defaults/gerrit/init.yml
+++ b/defaults/gerrit/init.yml
@@ -3,4 +3,13 @@
     gerrit_pipeline_library_repo: https://github.com/Mirantis/pipeline-library
     gerrit_mk_pipelines_repo: https://github.com/Mirantis/mk-pipelines
     gerrit_mcp_common_scripts_repo: https://github.com/Mirantis/mcp-common-scripts
+    gerrit_config_download_command:
+      - checkout
+      - cherry-pick
+      - pull
+      - format_patch
+    gerrit_config_download_scheme:
+      - http
+      - ssh
+      - anon_http
 
diff --git a/docker/swarm/stack/monitoring/pushgateway.yml b/docker/swarm/stack/monitoring/pushgateway.yml
index 461eb0b..582dc93 100644
--- a/docker/swarm/stack/monitoring/pushgateway.yml
+++ b/docker/swarm/stack/monitoring/pushgateway.yml
@@ -15,7 +15,7 @@
               networks:
                 - monitoring
               deploy:
-                replicas: 2
+                replicas: 1
                 labels:
                   com.mirantis.monitoring: "pushgateway"
                 restart_policy:
diff --git a/gerrit/server/single.yml b/gerrit/server/single.yml
index f0f6492..21b0104 100644
--- a/gerrit/server/single.yml
+++ b/gerrit/server/single.yml
@@ -54,6 +54,9 @@
         pool_max_idle: 16
       change_cleanup:
         abandon_after: 3months
+      download:
+        command: ${_param:gerrit_config_download_command}
+        scheme: ${_param:gerrit_config_download_scheme}
   postgresql:
     server:
       version: "9.5"
diff --git a/jenkins/client/job/deploy/update/upgrade_galera.yml b/jenkins/client/job/deploy/update/upgrade_galera.yml
index 83593ec..8864529 100644
--- a/jenkins/client/job/deploy/update/upgrade_galera.yml
+++ b/jenkins/client/job/deploy/update/upgrade_galera.yml
@@ -27,10 +27,6 @@
             SALT_MASTER_CREDENTIALS:
               type: string
               default: "salt"
-            BACKUP_GALERA:
-              type: boolean
-              default: 'true'
-              description: "Backup galera cluster"
             SHUTDOWN_CLUSTER:
               type: boolean
               default: 'false'
diff --git a/prometheus/gainsight/query/openstack.yml b/prometheus/gainsight/query/openstack.yml
index 0e7aab6..679a6fc 100644
--- a/prometheus/gainsight/query/openstack.yml
+++ b/prometheus/gainsight/query/openstack.yml
@@ -11,11 +11,11 @@
         instances: "'Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
         compute_nodes: "'Compute Nodes','avg(sum(openstack_nova_services{binary=~\"nova.compute\"}) by (instance))'"
         tenants: "'Tenants','avg(sum(avg_over_time(openstack_keystone_tenants_total[24h])) by (instance))'"
-        cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{name=\"cinderv2\"}[24h]))'"
-        nova_api: "'Nova API','avg(avg_over_time(openstack_api_check_status{name=\"nova\"}[24h]))'"
-        keystone_api: "'Keystone API','avg(avg_over_time(openstack_api_check_status{name=\"keystone\"}[24h]))'"
-        glance_api: "'Glance API','avg(avg_over_time(openstack_api_check_status{name=\"glance\"}[24h]))'"
-        neutron_api: "'Neutron API','avg(avg_over_time(openstack_api_check_status{name=\"neutron\"}[24h]))'"
+        cinder_api: "'Cinder API','avg_over_time(name:openstack_api_check_status:avg5m:for5m:ceil:avg5m:floor{name=\"cinderv2\"}[24h])'"
+        nova_api: "'Nova API','avg_over_time(name:openstack_api_check_status:avg5m:for5m:ceil:avg5m:floor{name=\"nova\"}[24h])'"
+        keystone_api: "'Keystone API','avg_over_time(name:openstack_api_check_status:avg5m:for5m:ceil:avg5m:floor{name=\"keystone\"}[24h])'"
+        glance_api: "'Glance API','avg_over_time(name:openstack_api_check_status:avg5m:for5m:ceil:avg5m:floor{name=\"glance\"}[24h])'"
+        neutron_api: "'Neutron API','avg_over_time(name:openstack_api_check_status:avg5m:for5m:ceil:avg5m:floor{name=\"neutron\"}[24h])'"
         nova_vm_all: "'Total VM number','avg_over_time(total:openstack_nova_instance_all[1d])'"
         nova_vm_failed: "'Failed VM number','avg_over_time(total:openstack_nova_instance_failed[1d])'"
         kpi_downtime: "'KPI Downtime','1 - avg_over_time(total:openstack_nova_instance_failed[1d]) / avg_over_time(total:openstack_nova_instance_all[1d])'"