diff --git a/apache/server/site/aodh.yml b/apache/server/site/aodh.yml
index 6ce5ede..3b7fc23 100644
--- a/apache/server/site/aodh.yml
+++ b/apache/server/site/aodh.yml
@@ -22,8 +22,8 @@
             port: ${_param:apache_aodh_api_port}
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_aodh_log_format}
+              file: /var/log/apache2/aodh_access.log
           wsgi:
             daemon_process: aodh-api
             processes: ${_param:aodh_api_workers}
diff --git a/apache/server/site/barbican.yml b/apache/server/site/barbican.yml
index 0e7da2c..7a4297b 100644
--- a/apache/server/site/barbican.yml
+++ b/apache/server/site/barbican.yml
@@ -31,7 +31,7 @@
             port: 9311
           log:
             custom:
-              format: 'combined'
+              format: ${_param:apache_site_openstack_barbican_log_format}
               file: '/var/log/barbican/barbican-api.log'
             error:
               enabled: true
@@ -55,7 +55,7 @@
             port: 9312
           log:
             custom:
-              format: 'combined'
+              format: ${_param:apache_site_openstack_barbican_log_format}
               file: '/var/log/barbican/barbican-api.log'
             error:
               enabled: true
diff --git a/apache/server/site/cinder.yml b/apache/server/site/cinder.yml
index d1e3475..785817a 100644
--- a/apache/server/site/cinder.yml
+++ b/apache/server/site/cinder.yml
@@ -35,8 +35,8 @@
             port: 8776
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_cinder_log_format}
+              file: /var/log/apache2/cinder.log
             error:
               enabled: true
               format: '%M'
diff --git a/apache/server/site/gnocchi.yml b/apache/server/site/gnocchi.yml
index 12d5f24..7aaba6f 100644
--- a/apache/server/site/gnocchi.yml
+++ b/apache/server/site/gnocchi.yml
@@ -22,8 +22,7 @@
             port: ${_param:apache_gnocchi_api_port}
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_gnocchi_log_format}
           wsgi:
             daemon_process: gnocchi-api
             processes: ${_param:gnocchi_api_workers}
diff --git a/apache/server/site/horizon.yml b/apache/server/site/horizon.yml
index 5cfca1e..e909d4c 100644
--- a/apache/server/site/horizon.yml
+++ b/apache/server/site/horizon.yml
@@ -56,8 +56,7 @@
               allow: 'from all'
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_horizon_log_format}
             error:
               enabled: true
               level: debug
diff --git a/apache/server/site/manila.yml b/apache/server/site/manila.yml
index 3080d1d..163f237 100644
--- a/apache/server/site/manila.yml
+++ b/apache/server/site/manila.yml
@@ -38,8 +38,8 @@
             port: 8786
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_manila_log_format}
+              file: /var/log/apache2/manila.access.log
             error:
               enabled: true
               level: debug
diff --git a/apache/server/site/nova-placement.yml b/apache/server/site/nova-placement.yml
index 7c8e8bd..a869fea 100644
--- a/apache/server/site/nova-placement.yml
+++ b/apache/server/site/nova-placement.yml
@@ -37,8 +37,7 @@
             port: 8778
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_placement_log_format}
               file: '/var/log/apache2/nova_placement_access.log'
             error:
               enabled: true
diff --git a/apache/server/site/panko.yml b/apache/server/site/panko.yml
index eff49c5..a34190d 100644
--- a/apache/server/site/panko.yml
+++ b/apache/server/site/panko.yml
@@ -22,8 +22,8 @@
             port: ${_param:apache_panko_api_port}
           log:
             custom:
-              format: >-
-                %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+              format: ${_param:apache_site_openstack_panko_log_format}
+              file: /var/log/apache2/panko.access.log
           wsgi:
             daemon_process: panko-api
             processes: ${_param:panko_api_workers}
diff --git a/defaults/backupninja.yml b/defaults/backupninja.yml
index e89ed86..f827173 100644
--- a/defaults/backupninja.yml
+++ b/defaults/backupninja.yml
@@ -1,4 +1,5 @@
 parameters:
   _param:
     backupninja_engine: rsync
+    backupninja_backup_host: 127.0.0.1
     backupninja_public_key: no-key-provided
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index b5b66e1..3ad9e13 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -157,6 +157,18 @@
     apache_proxy_openstack_aodh_retry: ${_param:apache_proxy_openstack_api_retry}
     apache_proxy_openstack_placement_retry: ${_param:apache_proxy_openstack_api_retry}
     apache_proxy_openstack_octavia_retry: ${_param:apache_proxy_openstack_api_retry}
+    # Formats for logs for openstack apache sites
+    apache_site_openstack_api_log_format: >-
+      %v:%p %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+    apache_site_openstack_aodh_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_barbican_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_cinder_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_gnocchi_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_horizon_log_format: >-
+      %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+    apache_site_openstack_manila_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_placement_log_format: ${_param:apache_site_openstack_api_log_format}
+    apache_site_openstack_panko_log_format: ${_param:apache_site_openstack_api_log_format}
     # Horizon
     # 'direct' mode will require cors on glance side to be enabled.
     horizon_images_upload_mode: 'direct'
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-upmap.yml
new file mode 100644
index 0000000..f6390a6
--- /dev/null
+++ b/jenkins/client/job/ceph/add-osd-upmap.yml
@@ -0,0 +1,32 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        ceph-add-osd-upmap:
+          type: workflow-scm
+          concurrent: true
+          display_name: "Ceph - add osd"
+          description: "This pipeline requires ceph luminous version, all clients must be upgraded to luminous version to proceed."
+          discard:
+            build:
+              keep_num: 50
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            branch: "${_param:jenkins_pipelines_branch}"
+            credentials: "gerrit"
+            script: ceph-add-osd-upmap.groovy
+          param:
+            # general parameters
+            SALT_MASTER_URL:
+              type: string
+              description: URL of Salt master
+              default: "${_param:jenkins_salt_api_url}"
+            SALT_MASTER_CREDENTIALS:
+              type: string
+              description: Credentials for login to Salt API
+              default: salt
+            HOST:
+              type: string
+              description: OSD HOST that will be added to Ceph cluster (rgw04*)
+              default: 'osd*'
diff --git a/jenkins/client/job/deploy/galera_database_backup.yml b/jenkins/client/job/deploy/galera_database_backup.yml
index e78c29b..1cb96a8 100644
--- a/jenkins/client/job/deploy/galera_database_backup.yml
+++ b/jenkins/client/job/deploy/galera_database_backup.yml
@@ -26,8 +26,5 @@
             SALT_MASTER_URL:
               type: string
               default: "${_param:jenkins_salt_api_url}"
-            ASK_CONFIRMATION:
-              type: boolean
-              default: 'true'
           triggers:
             - timed: "${_param:backup_min} ${_param:backup_hour} ${_param:backup_day_of_month} ${_param:backup_month} ${_param:backup_day_of_week}"
diff --git a/kubernetes/control/services/drivetrain/jenkins_master.yml b/kubernetes/control/services/drivetrain/jenkins_master.yml
index a198dff..3437196 100644
--- a/kubernetes/control/services/drivetrain/jenkins_master.yml
+++ b/kubernetes/control/services/drivetrain/jenkins_master.yml
@@ -15,6 +15,12 @@
             value: false
           - name: nginx.ingress.kubernetes.io/add-base-url
             value: true
+          - name: nginx.ingress.kubernetes.io/proxy-body-size
+            value: "0"
+          - name: nginx.ingress.kubernetes.io/proxy-buffering
+            value: "off"
+          - name: nginx.ingress.kubernetes.io/proxy-request-buffering
+            value: "off"
           apiVersion: extensions/v1beta1
           cluster: drivetrain
           enabled: true
diff --git a/neutron/control/ovn/single.yml b/neutron/control/ovn/single.yml
index f3dd749..5305fc9 100644
--- a/neutron/control/ovn/single.yml
+++ b/neutron/control/ovn/single.yml
@@ -40,17 +40,3 @@
         db-sb-create-insecure-remote: 'yes'
         db-nb-addr: ${_param:single_address}
         db-sb-addr: ${_param:single_address}
-  mysql:
-    server:
-      database:
-        neutron:
-          encoding: utf8
-          users:
-          - name: neutron
-            password: ${_param:mysql_neutron_password}
-            host: '%'
-            rights: all
-          - name: neutron
-            password: ${_param:mysql_neutron_password}
-            host: ${_param:cluster_local_address}
-            rights: all