diff --git a/cinder/volume/backend/lvm.yml b/cinder/volume/backend/lvm.yml
index 768fb6b..6559e46 100644
--- a/cinder/volume/backend/lvm.yml
+++ b/cinder/volume/backend/lvm.yml
@@ -1,6 +1,8 @@
 parameters:
   _param:
-    cinder_lvm_devices: [ "/dev/loop0" ]
+    cinder_lvm_default_device:  "/dev/loop0"
+    cinder_lvm_devices:
+    - ${_param:cinder_lvm_default_device}
   linux:
     storage:
       lvm:
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
index 976ed1a..fe0f959 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-formula-test-pipeline.yml
@@ -18,6 +18,27 @@
             url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
             credentials: "gerrit"
             script: pipelines/mcp-formula-change-test-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                kubernetes/kubernetes:
+                  branches:
+                    - compare_type: "ANT"
+                      name: "**"
+              skip_vote:
+                - successful
+                - failed
+                - unstable
+                - not_built
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeTrivialRebase: false
+                      excludeNoCodeChange: false
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
           param:
             SOURCE_CREDENTIALS:
               type: string
diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 6c5744a..e0814cd 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,11 +1,6 @@
 classes:
 - service.neutron.client
 parameters:
-  _param:
-     # TODO Remove below variables with typo in next release
-     openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
-     openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
-     openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
   neutron:
     client:
       server: