diff --git a/custom-vpc-contract-encrypter/vpccontractencrypter.star b/custom-vpc-contract-encrypter/vpccontractencrypter.star
index bb382ac..bb2aa5f 100644
--- a/custom-vpc-contract-encrypter/vpccontractencrypter.star
+++ b/custom-vpc-contract-encrypter/vpccontractencrypter.star
@@ -23,12 +23,12 @@ def transform(new_artifacts, old_artifacts):
     for new_artifact in new_artifacts:
         data = {}
         if "envType" in new_artifact["configs"]["VpcContractSec"].keys():
-            envPass = m2k.query({"id": "move2kube.ibmvpc.env.password", "type": "Input", "description": "Enter the password for encryption of env(Private Key) : ", "hint": ["If ignored, encrypted contract file would be empty"], "default": ""})
+            envPass = m2k.query({"id": "move2kube.ibmvpc.env.password", "type": "Password", "description": "Enter the password for encryption of env(Private Key) : ", "hint": ["If ignored, encrypted contract file would be empty"], "default": ""})
             envData = fs.read(fs.path_join(new_artifact["paths"]["VpcContract"][0], 'env.yaml'))
             data["EnvData"] = envData
             data["EnvPass"] = envPass
         if "workloadType" in new_artifact["configs"]["VpcContractSec"].keys():
-            workloadPass = m2k.query({"id": "move2kube.ibmvpc.workload.password", "type": "Input", "description": "Enter the password for encryption of workload (Private Key) : ", "hint": ["If ignored, encrypted contract file would be empty"], "default": ""})
+            workloadPass = m2k.query({"id": "move2kube.ibmvpc.workload.password", "type": "Password", "description": "Enter the password for encryption of workload (Private Key) : ", "hint": ["If ignored, encrypted contract file would be empty"], "default": ""})
             workloadData = fs.read(fs.path_join(new_artifact["paths"]["VpcContract"][0], 'workload.yaml'))
             data["WorkloadData"] = workloadData
             data["WorkloadPass"] = workloadPass
diff --git a/custom-vpc-contract-generator/vpccontractgenerator.star b/custom-vpc-contract-generator/vpccontractgenerator.star
index 33a30b4..68cb7d3 100644
--- a/custom-vpc-contract-generator/vpccontractgenerator.star
+++ b/custom-vpc-contract-generator/vpccontractgenerator.star
@@ -18,7 +18,7 @@ def transform(new_artifacts, old_artifacts):
     artifacts = []
 
     ## Q&A to fill the contract file
-    usesVPC = m2k.query({"id": "move2kube.ibmvpc.choice", "type": "Select", "description": "Do you use IBM VPC?", "hints": ["A VPC contract file will be created."], "options": ["Yes", "No"]})
+    usesVPC = m2k.query({"id": "move2kube.ibmvpc.enabled", "type": "Select", "description": "Do you use IBM VPC?", "hints": ["A VPC contract file will be created."], "options": ["Yes", "No"]})
     if usesVPC == "No":
         return {'pathMappings': pathMappings, 'artifacts': artifacts}