diff --git a/jenkins/client/job/deploy/update/cloud_update.yml b/jenkins/client/job/deploy/update/cloud_update.yml
index 5fea283..02cf89d 100644
--- a/jenkins/client/job/deploy/update/cloud_update.yml
+++ b/jenkins/client/job/deploy/update/cloud_update.yml
@@ -48,6 +48,18 @@
               type: boolean
               default: 'true'
               description: "Stop API services before update"
+            TARGET_UPDATES:
+              type: string
+              default: "cfg,ctl,prx,msg,dbs"
+              description: "Comma separated list of nodes to update (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid,cmp,kvm,osd,gtw-physical)"
+            TARGET_ROLLBACKS:
+              type: string
+              default: ""
+              description: "Comma separated list of nodes to update (Valid values are ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cmp,kvm,osd,gtw-physical)"
+            TARGET_MERGES:
+              type: string
+              default: ""
+              description: "Comma separated list of nodes to update (Valid values are cfg,ctl,prx,msg,dbs,log,mon,mtr,ntw,nal,gtw-virtual,cmn,rgw,cid)"
             CTL_TARGET:
               type: string
               default: "ctl*"
@@ -116,142 +128,6 @@
               type: boolean
               default: 'false'
               description: "Reboot nodes after update"
-            UPDATE_CFG:
-              type: boolean
-              default: 'true'
-              description: "Run update on cfg nodes"
-            UPDATE_CTL:
-              type: boolean
-              default: 'true'
-              description: "Run update on ctl nodes"
-            UPDATE_PRX:
-              type: boolean
-              default: 'true'
-              description: "Run update on prx nodes"
-            UPDATE_MSG:
-              type: boolean
-              default: 'true'
-              description: "Run update on msg nodes"
-            UPDATE_DBS:
-              type: boolean
-              default: 'true'
-              description: "Run update on dbs nodes"
-            UPDATE_LOG:
-              type: boolean
-              default: 'true'
-              description: "Run update on log nodes"
-            UPDATE_MON:
-              type: boolean
-              default: 'true'
-              description: "Run update on mon nodes"
-            UPDATE_MTR:
-              type: boolean
-              default: 'true'
-              description: "Run update on mtr nodes"
-            UPDATE_NTW:
-              type: boolean
-              default: 'true'
-              description: "Run update on ntw nodes"
-            UPDATE_NAL:
-              type: boolean
-              default: 'true'
-              description: "Run update on nal nodes"
-            UPDATE_GTW_VIRTUAL:
-              type: boolean
-              default: 'true'
-              description: "Run update on gtw nodes"
-            UPDATE_CMN:
-              type: boolean
-              default: 'true'
-              description: "Run update on cmn nodes"
-            UPDATE_RGW:
-              type: boolean
-              default: 'true'
-              description: "Run update on rgw nodes"
-            UPDATE_CID:
-              type: boolean
-              default: 'true'
-              description: "Run update on cid nodes"
-            UPDATE_CMP:
-              type: boolean
-              default: 'true'
-              description: "Run update on physical cmp nodes"
-            UPDATE_KVM:
-              type: boolean
-              default: 'true'
-              description: "Run update on physical kvm nodes"
-            UPDATE_CEPH_OSD:
-              type: boolean
-              default: 'true'
-              description: "Run update on physical Ceph OSD nodes"
-            UPDATE_GTW_PHYSICAL:
-              type: boolean
-              default: 'true'
-              description: "Run update on physical gtw nodes"
-            ROLLBACK_CTL:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on ctl nodes"
-            ROLLBACK_PRX:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on prx nodes"
-            ROLLBACK_MSG:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on msg nodes"
-            ROLLBACK_DBS:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on dbs nodes"
-            ROLLBACK_LOG:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on log nodes"
-            ROLLBACK_MON:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on mon nodes"
-            ROLLBACK_MTR:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on mtr nodes"
-            ROLLBACK_NTW:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on ntw nodes"
-            ROLLBACK_NAL:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on nal nodes"
-            ROLLBACK_GTW_VIRTUAL:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on gtw nodes"
-            ROLLBACK_CMN:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on cmn nodes"
-            ROLLBACK_RGW:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on rgw nodes"
-            ROLLBACK_CMP:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on physical cmp nodes"
-            ROLLBACK_KVM:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on physical kvm nodes"
-            ROLLBACK_CEPH_OSD:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on physical Ceph OSD nodes"
-            ROLLBACK_GTW_PHYSICAL:
-              type: boolean
-              default: 'false'
-              description: "Run rollback on physical gtw nodes"
             ROLLBACK_PKG_VERSIONS:
               type: string
               default: ""
@@ -264,62 +140,6 @@
               type: string
               default: ""
               description: "Space separated list of pkgs=versions to be removed (ex. pkg_name1=pkg_version1 pkg_name2=pkg_version2)"
-            MERGE_CFG:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for cfg nodes"
-            MERGE_CTL:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for ctl nodes"
-            MERGE_PRX:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for prx nodes"
-            MERGE_MSG:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for msg nodes"
-            MERGE_DBS:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for dbs nodes"
-            MERGE_LOG:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for log nodes"
-            MERGE_MON:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for mon nodes"
-            MERGE_MTR:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for mtr nodes"
-            MERGE_NTW:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for ntw nodes"
-            MERGE_NAL:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for nal nodes"
-            MERGE_GTW_VIRTUAL:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for gtw nodes"
-            MERGE_CMN:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for cmn nodes"
-            MERGE_RGW:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for rgw nodes"
-            MERGE_CID:
-              type: boolean
-              default: 'false'
-              description: "Merge live snapshot for cid nodes"
             RESTORE_GALERA:
               type: boolean
               default: 'false'