diff --git a/apache/server/proxy/openstack/oadh.yml b/apache/server/proxy/openstack/aodh.yml
similarity index 100%
rename from apache/server/proxy/openstack/oadh.yml
rename to apache/server/proxy/openstack/aodh.yml
diff --git a/apache/server/site/aodh.yml b/apache/server/site/aodh.yml
new file mode 100644
index 0000000..6ce5ede
--- /dev/null
+++ b/apache/server/site/aodh.yml
@@ -0,0 +1,36 @@
+parameters:
+  _param:
+    apache_ssl:
+      enabled: false
+    apache_aodh_ssl: ${_param:apache_ssl}
+    aodh_api_workers: 2
+    apache_aodh_api_host: ${linux:network:fqdn}
+    apache_aodh_api_address: ${_param:single_address}
+    apache_aodh_api_port: 8042
+  apache:
+    server:
+      site:
+        aodh:
+          enabled: false
+          available: true
+          type: wsgi
+          name: aodh
+          ssl: ${_param:apache_aodh_ssl}
+          host:
+            name: ${_param:apache_aodh_api_host}
+            address: ${_param:apache_aodh_api_address}
+            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\"
+          wsgi:
+            daemon_process: aodh-api
+            processes: ${_param:aodh_api_workers}
+            threads: 1
+            user: aodh
+            group: aodh
+            display_name: '%{GROUP}'
+            script_alias: '/ /usr/share/aodh/app.wsgi'
+            application_group: '%{GLOBAL}'
+            authorization: 'On'
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index acdb8e0..11279ed 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -38,6 +38,14 @@
             SALT_MASTER_CREDENTIALS:
               type: string
               default: "salt-qa-credentials"
+            SIMPLE_UPGRADE:
+              type: boolean
+              default: 'false'
+              description: "Choose between simple upgrade or upgrade with draining nodes"
+            UPGRADE_DOCKER:
+              type: boolean
+              default: 'false'
+              description: "Upgrade docker or not"
             PER_NODE:
               type: boolean
               default: 'true'
diff --git a/keystone/client/v3/service/ironic.yml b/keystone/client/v3/service/ironic.yml
index 09c6967..bd101e6 100644
--- a/keystone/client/v3/service/ironic.yml
+++ b/keystone/client/v3/service/ironic.yml
@@ -15,20 +15,20 @@
                 service_admin:
                   name: admin
                   project_id: service
-          service:
+          services:
             ironic:
               type: baremetal
               description: OpenStack Baremetal Service
               endpoints:
                 ironic_public:
-                  internface: 'public'
+                  interface: 'public'
                   url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:6385
                   region: ${_param:openstack_region}
                 ironic_internal:
-                  internface: 'internal'
+                  interface: 'internal'
                   url: ${_param:ironic_service_protocol}://${_param:ironic_service_host}:6385
                   region: ${_param:openstack_region}
                 ironic_admin:
-                  internface: 'admin'
+                  interface: 'admin'
                   url: ${_param:ironic_service_protocol}://${_param:ironic_service_host}:6385
                   region: ${_param:openstack_region}
diff --git a/keystone/client/v3/service/radosgw-s3.yml b/keystone/client/v3/service/radosgw-s3.yml
index 25614cb..d069d9e 100644
--- a/keystone/client/v3/service/radosgw-s3.yml
+++ b/keystone/client/v3/service/radosgw-s3.yml
@@ -15,7 +15,7 @@
                 service_admin:
                   name: admin
                   project_id: service
-          service:
+          services:
             radosgw-s3:
               type: s3
               description: S3 Service (radosgw)
diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index 4fa6756..e3b8ac3 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -15,7 +15,7 @@
                 service_admin:
                   name: admin
                   project_id: service
-          service:
+          services:
             radosgw-swift:
               type: object-store
               description: Swift Service (radosgw)