             continue
 
           if content = jspath.getAt availableData[type], field
-            search   = ///\${var.koding_#{type}_#{field}}///g
+            search   = if type is 'custom'  \
+              then ///\${var.#{type}_#{field}}///g
+              else ///\${var.koding_#{type}_#{field}}///g
             template = template.replace search, content
           else
             errors.push "Variable `#{field}` not found in `#{type}` data."

      name : 'Stack Template'
      view : @stackTemplateView

    @variablesView                     = new VariablesView delegate: this
    @tabView.addPane variablesPane     = new KDTabPaneView
      name : 'Variables'
      view : @variablesView

    credentials   =
      aws         : [ awsIdentifier ]

    # Add Custom Variables if exists
    if variablesCredential = @variablesView._activeCredential
      credentials.custom   = [variablesCredential.identifier]

    if 'yaml' is @stackTemplateView.editorView.getOption 'contentType'
      convertedDoc = yamlToJson templateContent
