diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml
index 4ce192930b..8a439ff1bf 100644
--- a/src/sunstone/etc/sunstone-views/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/cloud.yaml
@@ -8,6 +8,7 @@ tabs:
         panel_tabs:
             users: false
             flows: true
+            templates: true
         actions:
             Template.chmod: false
             Template.delete: true
@@ -17,3 +18,6 @@ tabs:
             vdcquotas: false
             vdcvms: false
             users:  false
+        create_vm:
+            capacity_select: true
+            network_select: true
diff --git a/src/sunstone/etc/sunstone-views/vdcadmin.yaml b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
index aea47b87f7..722588a068 100644
--- a/src/sunstone/etc/sunstone-views/vdcadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
@@ -8,6 +8,7 @@ tabs:
         panel_tabs:
             users: true
             flows: true
+            templates: true
         actions:
             Template.chmod: true
             Template.delete: true
@@ -17,3 +18,6 @@ tabs:
             vdcquotas: true
             vdcvms: true
             users:  true
+        create_vm:
+            capacity_select: true
+            network_select: true
diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js
index 4fff770c87..1ecef6be36 100644
--- a/src/sunstone/public/js/plugins/config-tab.js
+++ b/src/sunstone/public/js/plugins/config-tab.js
@@ -106,6 +106,15 @@ Config = {
           }
         }
       },
+      "create_vm": {
+        "isEnabled": function(widget) {
+          if (config['view']['tabs']['provision-tab'] && config['view']['tabs']['provision-tab']["create_vm"]){
+            return config['view']['tabs']['provision-tab']['create_vm'][widget];
+          } else {
+            return false;
+          }
+        }
+      },
       "logo": (config['view']["provision_logo"] || "images/one_small_logo.png")
     }
 }
diff --git a/src/sunstone/public/js/plugins/provision-tab.js b/src/sunstone/public/js/plugins/provision-tab.js
index cbf98cf958..2ae6752188 100644
--- a/src/sunstone/public/js/plugins/provision-tab.js
+++ b/src/sunstone/public/js/plugins/provision-tab.js
@@ -554,14 +554,16 @@ var provision_create_vm = '<form id="provision_create_vm" class="hidden section_
   '<br>'+
   '<div class="row">'+
     '<div class="large-10 large-centered columns">'+
-        '<div class="provision_capacity_selector">'+
-        '</div>'+
-        '<br>'+
-        '<br>'+
-        '<div class="provision_network_selector">'+
-        '</div>'+
-        '<br>'+
-        '<br>'+
+        (Config.provision.create_vm.isEnabled("capacity_select") ? 
+          '<div class="provision_capacity_selector">'+
+          '</div>'+
+          '<br>'+
+          '<br>' : '') +
+        (Config.provision.create_vm.isEnabled("network_select") ? 
+          '<div class="provision_network_selector">'+
+          '</div>'+
+          '<br>'+
+          '<br>' : '') +
         '<div class="provision_custom_attributes_selector">'+
         '</div>'+
     '</div>'+
@@ -6293,18 +6295,22 @@ $(document).ready(function(){
 
         $(".provision_accordion_template a").first().trigger("click");
 
-        generate_provision_instance_type_accordion(
-          $(".provision_capacity_selector", create_vm_context),
-          template_json.VMTEMPLATE.TEMPLATE);
+        if (Config.provision.create_vm.isEnabled("capacity_select")) {
+          generate_provision_instance_type_accordion(
+            $(".provision_capacity_selector", create_vm_context),
+            template_json.VMTEMPLATE.TEMPLATE);
+        };
 
-        generate_provision_network_accordion(
-          $(".provision_network_selector", create_vm_context));
+        if (Config.provision.create_vm.isEnabled("network_select")) {
+          generate_provision_network_accordion(
+            $(".provision_network_selector", create_vm_context));
 
-        $.each(nics, function(index, nic){
-            generate_provision_network_table(
-              $(".provision_nic_accordion", create_vm_context),
-              nic);
-        })
+          $.each(nics, function(index, nic){
+              generate_provision_network_table(
+                $(".provision_nic_accordion", create_vm_context),
+                nic);
+          })
+        }
 
         if (template_json.VMTEMPLATE.TEMPLATE.USER_INPUTS) {
           generate_custom_attrs(