diff --git a/app/deployments/routes.py b/app/deployments/routes.py
index 38f219109..74e927d0d 100644
--- a/app/deployments/routes.py
+++ b/app/deployments/routes.py
@@ -460,7 +460,9 @@ def updatedep():
         else:
             remove_sla_from_template(template)
 
-        inputs = {k: v for (k, v) in form_data.items() if not k.startswith("extra_opts.") and not k == '_depid'}
+        stinputs = json.loads(dep.stinputs.strip('\"')) if dep.stinputs else {}
+        inputs = {k: v for (k, v) in form_data.items() if not k.startswith("extra_opts.") and not k == '_depid' and (
+            k in stinputs and 'updatable' in stinputs[k] and stinputs[k]['updatable'] == True)}
 
         additionaldescription = form_data['additional_description']
 
diff --git a/app/deployments/templates/input_types.html b/app/deployments/templates/input_types.html
index 062a508e4..111fb8ea8 100644
--- a/app/deployments/templates/input_types.html
+++ b/app/deployments/templates/input_types.html
@@ -43,7 +43,7 @@
 
     <!-- list text type -->
     {% elif value.type == "list" and value.entry_schema.type|lower == "string" %}
-      <fieldset class="border p-2">
+      <fieldset class="border p-2" {{mode}}>
         <!--legend class="w-auto">{{key}}</legend-->
       {% include 'inputs/list.html' %}
       </fieldset>
@@ -51,7 +51,7 @@
 
     <!-- list text type -->
     {% elif value.type == "list" and value.entry_schema.type|lower == "map" %}
-      <fieldset class="border p-2">
+      <fieldset class="border p-2" {{mode}}>
         <!--legend class="w-auto">{{key}}</legend-->
       {% include 'inputs/list_map_string.html' %}
       </fieldset>
@@ -177,7 +177,7 @@ <h5 class="modal-title">Storage encryption alert</h5>
 
     <!-- List of map of strings -->
     {% elif value.type == "map" and value.entry_schema.type == "string" %}
-      <fieldset class="border p-2">
+      <fieldset class="border p-2" {{mode}}>
       {% include 'inputs/map_string.html' %}
       </fieldset>
     <!-- end Port field -->
@@ -185,7 +185,7 @@ <h5 class="modal-title">Storage encryption alert</h5>
     <!-- Port field -->
     {% elif value.type == "map" and (value.entry_schema.type == "tosca.datatypes.network.PortSpec" or value.entry_schema.type == "tosca.datatypes.indigo.network.PortSpec") %}
     {% set ports_type = "indigo" if 'indigo' in value.entry_schema.type else "" %}
-      <fieldset class="border p-2">
+      <fieldset class="border p-2" {{mode}}>
       {% include 'inputs/ports.html' %}
       </fieldset>
     <!-- end Port field -->
diff --git a/app/deployments/templates/inputs/combined.html b/app/deployments/templates/inputs/combined.html
index 918f1c73e..709a202ed 100644
--- a/app/deployments/templates/inputs/combined.html
+++ b/app/deployments/templates/inputs/combined.html
@@ -1,4 +1,4 @@
-<select class="js-example-basic-single js-states form-control" id="{{key}}" name="{{key}}" data-action="removeOnSubmit" onchange="setfields(this)" required>
+<select class="js-example-basic-single js-states form-control" id="{{key}}" name="{{key}}" data-action="removeOnSubmit" onchange="setfields(this)" {{mode}} required>
     <option value="" disabled selected>--Select--</option>
   {% for constraint in value.constraints %}
     <option value="{{constraint['value']}}" data-values="{{constraint['set']}}">{{constraint['label']}}</option>
diff --git a/app/deployments/templates/inputs/dependent_select.html b/app/deployments/templates/inputs/dependent_select.html
index db1dc0568..e4eb8334d 100644
--- a/app/deployments/templates/inputs/dependent_select.html
+++ b/app/deployments/templates/inputs/dependent_select.html
@@ -1,4 +1,4 @@
-<select class="js-example-basic-single js-states form-control" id="{{key}}" name="{{key}}" data-parent-id="{{value.parent}}">
+<select class="js-example-basic-single js-states form-control" id="{{key}}" name="{{key}}" data-parent-id="{{value.parent}}" {{mode}}>
   {% for constraint in value.constraints %}
     <option data-parent-value="{{constraint['parent_value']}}" value="{{constraint['value']}}" {% if constraint['value'] in value.default %}selected="selected"{% endif %}>{{constraint['label']}}</option>
   {% endfor %}
diff --git a/app/deployments/templates/inputs/list.html b/app/deployments/templates/inputs/list.html
index d38fbd075..25c3d5801 100644
--- a/app/deployments/templates/inputs/list.html
+++ b/app/deployments/templates/inputs/list.html
@@ -1,7 +1,7 @@
 <div class="mt-2">
     <div id="{{key}}-container"></div>
     <button type="button" class="btn btn-sm btn-outline-info" id="add-new-item" class="add-new" data-tag-name="{{key}}">Add</button>
-    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value""/>
+    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value=""/>
 </div>
 
 
diff --git a/app/deployments/templates/inputs/list_map_string.html b/app/deployments/templates/inputs/list_map_string.html
index c9ad7ea00..33bf924ad 100644
--- a/app/deployments/templates/inputs/list_map_string.html
+++ b/app/deployments/templates/inputs/list_map_string.html
@@ -1,7 +1,7 @@
 <div class="mt-2">
     <div id="{{key}}-container"></div>
     <button type="button" class="btn btn-sm btn-outline-info" id="add-new-item" class="add-new" data-tag-name="{{key}}" onclick="addItem(this)">Add</button>
-    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value""/>
+    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value=""/>
 </div>
 
 
diff --git a/app/deployments/templates/inputs/map_string.html b/app/deployments/templates/inputs/map_string.html
index 525a35511..0a2677208 100644
--- a/app/deployments/templates/inputs/map_string.html
+++ b/app/deployments/templates/inputs/map_string.html
@@ -1,7 +1,7 @@
 <div class="mt-2">
     <div id="{{key}}-container"></div>
     <button type="button" class="btn btn-sm btn-outline-info" id="add-new-item" class="add-new" data-tag-name="{{key}}">Add</button>
-    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value""/>
+    <input id="id-{{key}}" type="hidden" data-output-type="json" name="{{key}}" value=""/>
 </div>