diff --git a/plugins/org.jboss.tools.openshift.core/src/org/jboss/tools/openshift/internal/core/docker/PushImageToRegistryJob.java b/plugins/org.jboss.tools.openshift.core/src/org/jboss/tools/openshift/internal/core/docker/PushImageToRegistryJob.java
index cad9ae261f..c7376776ee 100644
--- a/plugins/org.jboss.tools.openshift.core/src/org/jboss/tools/openshift/internal/core/docker/PushImageToRegistryJob.java
+++ b/plugins/org.jboss.tools.openshift.core/src/org/jboss/tools/openshift/internal/core/docker/PushImageToRegistryJob.java
@@ -63,7 +63,7 @@ protected IStatus doRun(final IProgressMonitor monitor) {
 		try {
 			// first, we need to tag the image with the OpenShift target
 			// project
-			this.dockerConnection.tagImage(imageName, tmpImageName);
+			this.dockerConnection.tagImage(imageName, tmpImageName); // username/fedora:my-tag & 172.30.1.1:5000/myproject/fedora:my-tag
 			// then we can push that image with the new name
 			this.dockerConnection.pushImage(tmpImageName, registryAccount, getPushProgressHandler(tmpImageName));
 			// FIXME: needs more fined tuned error handling once Neon.0 is no longer supported:
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java
index 5acab12185..f802a4e525 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java
@@ -13,7 +13,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -21,6 +25,7 @@
 import org.jboss.tools.openshift.internal.common.core.job.AbstractDelegatingMonitorJob;
 import org.jboss.tools.openshift.internal.ui.OpenShiftUIActivator;
 import org.jboss.tools.openshift.internal.ui.wizard.common.IResourceLabelsPageModel.Label;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.ImportApplicationWizard;
 
 import com.openshift.restclient.IClient;
 import com.openshift.restclient.OpenShiftException;
@@ -28,6 +33,7 @@
 import com.openshift.restclient.capability.CapabilityVisitor;
 import com.openshift.restclient.capability.resources.IClientCapability;
 import com.openshift.restclient.capability.resources.IProjectTemplateProcessing;
+import com.openshift.restclient.model.IBuildConfig;
 import com.openshift.restclient.model.IProject;
 import com.openshift.restclient.model.IResource;
 import com.openshift.restclient.model.template.IParameter;
@@ -45,21 +51,23 @@ public class CreateApplicationFromTemplateJob extends AbstractDelegatingMonitorJ
 	private Collection<Label> labels;
 	private Collection<IParameter> parameters;
 	private Collection<IResource> resources;
+	private String buildConfigName;
 
 	public CreateApplicationFromTemplateJob(IProject project, ITemplate template) {
-		this(project, template, Collections.emptyList(), Collections.emptyList());
+		this(project, template, "", Collections.emptyList(),Collections.emptyList());
 	}
 
-	public CreateApplicationFromTemplateJob(IProject project, ITemplate template, Collection<IParameter> parameters,
-			Collection<Label> labels) {
+	public CreateApplicationFromTemplateJob(IProject project, ITemplate template, String buildConfigName, Collection<IParameter> parameters, Collection<Label> labels) {
 		super("Create Application From Template Job");
 		this.project = project;
 		this.template = template;
+		this.buildConfigName = buildConfigName;
 		this.labels = labels;
 		this.parameters = parameters;
 	}
 
-	@Override
+	@SuppressWarnings("serial")
+    @Override
 	protected IStatus doRun(IProgressMonitor monitor) {
 		template.updateParameterValues(parameters);
 		for (Label label : labels) {
@@ -70,28 +78,44 @@ protected IStatus doRun(IProgressMonitor monitor) {
 
 			@Override
 			public IStatus visit(IProjectTemplateProcessing capability) {
-
+				
 				try {
 					ITemplate processed = capability.process(template);
 					Collection<IResource> existing = findExistingResources(project, processed);
-					if (!existing.isEmpty()) {
+					if(!existing.isEmpty()) {
 						return createErrorStatusForExistingResources(existing);
 					}
 					parameters = processed.getParameters().values();
 					resources = capability.apply(processed);
 					return handleResponse(resources);
-				} catch (OpenShiftException e) {
+				}catch(OpenShiftException e) {
 					String message = e.getMessage();
-					if (e.getStatus() != null) {
+					if(e.getStatus() != null) {
 						message = e.getStatus().getMessage();
 					}
 					return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, -1, message, e);
 				}
 			}
 
-		}, new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
-				"Template processing is unsupported for this client and server combination.", null));
 
+		},
+		new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Template processing is unsupported for this client and server combination.", null));
+		
+//		if (resources != null) {
+//		    Collection<IResource> buildConfigs = resources.stream().filter(r -> ResourceKind.BUILD_CONFIG.equals(r.getKind())).collect(Collectors.toList());
+//		    if (!buildConfigs.isEmpty()) {
+//		        Optional<IResource> buildConfigToImport = buildConfigs.stream().filter(r -> this.buildConfigName.equals(r.getName())).findFirst();
+//		        if (buildConfigToImport.isPresent()) {
+//		            ArrayList<IBuildConfig> buildConfigList = new ArrayList<>();
+//		            buildConfigList.add((IBuildConfig)buildConfigToImport.get());
+//		            Map<IProject, Collection<IBuildConfig>> projectsAndBuildConfigs = new HashMap<>();
+//		            projectsAndBuildConfigs.put(project, buildConfigList);
+//		            ImportApplicationWizard wizard = new ImportApplicationWizard(projectsAndBuildConfigs);
+//		            wizard.init(workbench, selection);
+//		        }
+//		    }
+//		}
+		
 		return status;
 	}
 
@@ -109,7 +133,7 @@ public Collection<IResource> visit(IClientCapability capability) {
 					try {
 						IResource found = client.get(resource.getKind(), resource.getName(), project.getName());
 						existing.add(found);
-					} catch (OpenShiftException e) {
+					}catch(OpenShiftException e) {
 						//this is expected if the resource is not found
 						//@TODO change to NotFoundException of some kind
 					}
@@ -118,7 +142,7 @@ public Collection<IResource> visit(IClientCapability capability) {
 			}
 		}, new ArrayList<IResource>());
 	}
-
+	
 	/**
 	 * Get the list of parameters for this Job.  
 	 * The values
@@ -126,24 +150,25 @@ public Collection<IResource> visit(IClientCapability capability) {
 	 * has been processed by the server.
 	 * @return
 	 */
-	public Collection<IParameter> getParameters() {
+	public Collection<IParameter> getParameters(){
 		return parameters;
 	}
-
+	
+	
 	@Override
-	public Collection<IResource> getResources() {
+	public Collection<IResource> getResources(){
 		return resources;
 	}
-
+	
 	private IStatus handleResponse(Collection<IResource> resources) {
 		int severity = IStatus.OK;
 		for (IResource resource : resources) {
-			if (resource.getKind() == ResourceKind.STATUS) {
+			if(resource.getKind() == ResourceKind.STATUS) {
 				severity = IStatus.WARNING;
 				break;
 			}
 		}
-		return new Status(severity, OpenShiftUIActivator.PLUGIN_ID, OK, "Resources created from template.", null);
+		return new Status(severity, OpenShiftUIActivator.PLUGIN_ID, OK,"Resources created from template.",null);
 	}
 
 }
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/utils/ResourceParametersUtils.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/utils/ResourceParametersUtils.java
new file mode 100644
index 0000000000..c22dd98062
--- /dev/null
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/utils/ResourceParametersUtils.java
@@ -0,0 +1,40 @@
+package org.jboss.tools.openshift.internal.ui.utils;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.osgi.util.NLS;
+
+import com.openshift.restclient.model.template.IParameter;
+
+public class ResourceParametersUtils {
+    
+    public static final String LABEL_UNKNOWN_PARAMETER = "(Unknown parameter {0})";
+    
+    private static final Pattern PATTERN = Pattern.compile("\\$\\{[^}]+\\}");
+    
+    private ResourceParametersUtils() {}
+
+    public static String replaceParametersInString(Map<String, IParameter> templateParameters, String str) {
+        if (str == null || str.length() == 0) {
+            return "";
+        }
+        if (templateParameters == null || templateParameters.isEmpty()) {
+            return str;
+        }
+        StringBuffer result = new StringBuffer();
+        Matcher m = PATTERN.matcher(str);
+        while (m.find()) {
+            String parameterVariable = m.group();
+            String parameterName = parameterVariable.substring(2, parameterVariable.length() - 1);
+            if (templateParameters.containsKey(parameterName)) {
+                m.appendReplacement(result, templateParameters.get(parameterName).getValue());
+            } else {
+                m.appendReplacement(result, NLS.bind(LABEL_UNKNOWN_PARAMETER, parameterName));
+            }
+        }
+        m.appendTail(result);
+        return result.toString();
+    }
+}
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/GitCloningWizardPage.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/GitCloningWizardPage.java
index aa980e2ee9..6a9f7a2ce0 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/GitCloningWizardPage.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/GitCloningWizardPage.java
@@ -67,19 +67,23 @@
  */
 public class GitCloningWizardPage extends AbstractOpenShiftWizardPage {
 
-	private IGitCloningPageModel model;
+	protected IGitCloningPageModel model;
 	private CloneDestinationPathValidator cloneDestinationPathValidator;
 
-	public GitCloningWizardPage(IWizard wizard, IGitCloningPageModel model) {
-		super(getTitle(model), "Configure the cloning settings by specifying the clone destination", "Cloning settings",
-				wizard);
-		this.model = model;
-	}
+    public GitCloningWizardPage(IWizard wizard, IGitCloningPageModel model) {
+        this(getTitle(model), "Configure the cloning settings by specifying the clone destination", "Cloning settings", wizard, model);
+    }
+
+	public GitCloningWizardPage(String title, String description, String pageName, IWizard wizard, IGitCloningPageModel model) {
+        super(title, description, pageName, wizard);
+        this.model = model;
+    }
 
-	private static String getTitle(IGitCloningPageModel model) {
-		String name = (model == null) ? null : model.getApplicationName();
-		return (name == null) ? "Import an existing OpenShift application"
-				: NLS.bind("Import the {0} OpenShift application", name);
+    private static String getTitle(IGitCloningPageModel model) {
+		String name = (model == null)? null: model.getApplicationName();
+		return (name == null)?
+				"Import an existing OpenShift application":
+				NLS.bind("Import the {0} OpenShift application", name);
 	}
 
 	@Override
@@ -87,49 +91,71 @@ protected void doCreateControls(Composite parent, DataBindingContext dbc) {
 		GridLayoutFactory.fillDefaults().applyTo(parent);
 
 		Composite cloneGroup = createCloneGroup(parent, dbc);
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(cloneGroup);
+		GridDataFactory.fillDefaults()
+			.align(SWT.FILL, SWT.FILL).grab(true, false)
+			.applyTo(cloneGroup);
 	}
-
+	
 	private Composite createCloneGroup(Composite parent, DataBindingContext dbc) {
 		Group cloneGroup = new Group(parent, SWT.NONE);
 		cloneGroup.setText("Clone destination");
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(cloneGroup);
-		GridLayoutFactory.fillDefaults().margins(10, 10).applyTo(cloneGroup);
+		GridDataFactory.fillDefaults()
+			.align(SWT.FILL, SWT.TOP).grab(true, false)	
+			.applyTo(cloneGroup);
+		GridLayoutFactory.fillDefaults()
+				.margins(10, 10).applyTo(cloneGroup);
 
 		Composite cloneGroupComposite = new Composite(cloneGroup, SWT.NONE);
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(cloneGroupComposite);
-		GridLayoutFactory.fillDefaults().numColumns(3).applyTo(cloneGroupComposite);
+		GridDataFactory.fillDefaults()
+			.align(SWT.FILL, SWT.FILL).grab(true, true)
+			.applyTo(cloneGroupComposite);
+		GridLayoutFactory.fillDefaults()
+			.numColumns(3)
+			.applyTo(cloneGroupComposite);
 
 		// use default clone destination path
 		Button useDefaultCloneDestinationButton = new Button(cloneGroupComposite, SWT.CHECK);
 		useDefaultCloneDestinationButton.setText("Use default clone destination");
 		useDefaultCloneDestinationButton.setToolTipText("Uncheck if you want to use a custom location to clone to");
-		GridDataFactory.fillDefaults().span(3, 1).align(SWT.LEFT, SWT.CENTER).applyTo(useDefaultCloneDestinationButton);
-		final IObservableValue<Boolean> useDefaultCloneDestinationObservable = BeanProperties
-				.value(IGitCloningPageModel.PROPERTY_USE_DEFAULT_CLONE_DESTINATION).observe(model);
-		ValueBindingBuilder.bind(WidgetProperties.selection().observe(useDefaultCloneDestinationButton))
-				.to(useDefaultCloneDestinationObservable).in(dbc);
+		GridDataFactory.fillDefaults()
+			.span(3, 1).align(SWT.LEFT, SWT.CENTER).applyTo(useDefaultCloneDestinationButton);
+		final IObservableValue<Boolean> useDefaultCloneDestinationObservable = 
+				BeanProperties.value(IGitCloningPageModel.PROPERTY_USE_DEFAULT_CLONE_DESTINATION).observe(model);
+		ValueBindingBuilder
+			.bind(WidgetProperties.selection().observe(useDefaultCloneDestinationButton))
+			.to(useDefaultCloneDestinationObservable)
+			.in(dbc);
 
 		// clone destination
 		Label repoPathLabel = new Label(cloneGroupComposite, SWT.NONE);
 		repoPathLabel.setText("Git Clone Location:");
-		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(repoPathLabel);
+		GridDataFactory.fillDefaults()
+			.align(SWT.LEFT, SWT.CENTER).applyTo(repoPathLabel);
 		final Text cloneDestinationText = new Text(cloneGroupComposite, SWT.BORDER);
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneDestinationText);
-		final IObservableValue<String> cloneDestinationObservable = WidgetProperties.text(SWT.Modify)
-				.observe(cloneDestinationText);
-		final IObservableValue<String> cloneDestinationModelObservable = BeanProperties
-				.value(IGitCloningPageModel.PROPERTY_CLONE_DESTINATION).observe(model);
-		ValueBindingBuilder.bind(cloneDestinationObservable).to(cloneDestinationModelObservable).in(dbc);
+		GridDataFactory.fillDefaults()
+			.align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneDestinationText);
+		final IObservableValue<String> cloneDestinationObservable = WidgetProperties.text(SWT.Modify).observe(cloneDestinationText);
+		final IObservableValue<String> cloneDestinationModelObservable = 
+				BeanProperties.value(IGitCloningPageModel.PROPERTY_CLONE_DESTINATION).observe(model);
+		ValueBindingBuilder
+			.bind(cloneDestinationObservable)
+			.to(cloneDestinationModelObservable)
+			.in(dbc);
 		Button browseCloneDestinationButton = new Button(cloneGroupComposite, SWT.PUSH);
 		browseCloneDestinationButton.setText("Browse...");
-		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT)
-				.applyTo(browseCloneDestinationButton);
+		GridDataFactory.fillDefaults()
+				.align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseCloneDestinationButton);
 		browseCloneDestinationButton.addSelectionListener(onCloneDestination());
-		ValueBindingBuilder.bind(WidgetProperties.enabled().observe(cloneDestinationText))
-				.notUpdating(useDefaultCloneDestinationObservable).converting(new InvertingBooleanConverter()).in(dbc);
-		ValueBindingBuilder.bind(WidgetProperties.enabled().observe(browseCloneDestinationButton))
-				.notUpdating(useDefaultCloneDestinationObservable).converting(new InvertingBooleanConverter()).in(dbc);
+		ValueBindingBuilder
+			.bind(WidgetProperties.enabled().observe(cloneDestinationText))
+			.notUpdating(useDefaultCloneDestinationObservable)
+			.converting(new InvertingBooleanConverter())
+			.in(dbc);
+		ValueBindingBuilder
+			.bind(WidgetProperties.enabled().observe(browseCloneDestinationButton))
+			.notUpdating(useDefaultCloneDestinationObservable)
+			.converting(new InvertingBooleanConverter())
+			.in(dbc);
 		// move focus to the project location text control when not choosing the
 		// 'Use default location' option.
 		UIUtils.focusOnSelection(useDefaultCloneDestinationButton, cloneDestinationText);
@@ -138,43 +164,58 @@ private Composite createCloneGroup(Composite parent, DataBindingContext dbc) {
 		Button reuseRepositoryButton = new Button(cloneGroupComposite, SWT.CHECK);
 		reuseRepositoryButton.setSelection(false);
 		reuseRepositoryButton.setText("Do not clone - use existing repository");
-		GridDataFactory.fillDefaults().span(3, 1).align(SWT.LEFT, SWT.CENTER).applyTo(reuseRepositoryButton);
-		final IObservableValue<Boolean> reuseGitReposityObservable = WidgetProperties.selection()
-				.observe(reuseRepositoryButton);
-		ValueBindingBuilder.bind(reuseGitReposityObservable)
-				.to(BeanProperties.value(IGitCloningPageModel.PROPERTY_REUSE_GIT_REPOSITORY).observe(model)).in(dbc);
-		IObservableValue<File> repoPathObservable = BeanProperties.value(IGitCloningPageModel.PROPERTY_REPO_PATH)
-				.observe(model);
-		ValueBindingBuilder.bind(WidgetProperties.enabled().observe(reuseRepositoryButton))
-				.notUpdating(repoPathObservable).converting(new FileExistsConverter()).in(dbc);
+		GridDataFactory.fillDefaults()
+			.span(3,1).align(SWT.LEFT, SWT.CENTER).applyTo(reuseRepositoryButton);
+		final IObservableValue<Boolean> reuseGitReposityObservable =
+				WidgetProperties.selection().observe(reuseRepositoryButton);
+		ValueBindingBuilder
+			.bind(reuseGitReposityObservable)
+			.to(BeanProperties.value(IGitCloningPageModel.PROPERTY_REUSE_GIT_REPOSITORY).observe(model))
+			.in(dbc);
+		IObservableValue<File> repoPathObservable =
+				BeanProperties.value(IGitCloningPageModel.PROPERTY_REPO_PATH).observe(model);
+		ValueBindingBuilder
+			.bind(WidgetProperties.enabled().observe(reuseRepositoryButton))
+			.notUpdating(repoPathObservable)
+			.converting(new FileExistsConverter())
+			.in(dbc);
 		ISWTObservableValue reuseRepoButtonEnabled = WidgetProperties.enabled().observe(reuseRepositoryButton);
-		ValueBindingBuilder.bind(reuseRepoButtonEnabled).notUpdating(repoPathObservable)
-				.converting(new Converter(File.class, Boolean.class) {
-
-					@Override
-					public Object convert(Object fromObject) {
-						return fromObject instanceof File && EGitUtils.isRepository((File) fromObject);
-					}
-				}).in(dbc);
-		this.cloneDestinationPathValidator = new CloneDestinationPathValidator(useDefaultCloneDestinationObservable,
-				cloneDestinationObservable, reuseGitReposityObservable, repoPathObservable);
+		ValueBindingBuilder
+			.bind(reuseRepoButtonEnabled)
+			.notUpdating(repoPathObservable)
+			.converting(new Converter(File.class, Boolean.class) {
+ 
+				@Override
+				public Object convert(Object fromObject) {
+					return fromObject instanceof File
+							&& EGitUtils.isRepository((File) fromObject);
+				}})
+			.in(dbc);
+		this.cloneDestinationPathValidator = new CloneDestinationPathValidator(
+						useDefaultCloneDestinationObservable, cloneDestinationObservable, reuseGitReposityObservable, repoPathObservable);
 		dbc.addValidationStatusProvider(cloneDestinationPathValidator);
 		ControlDecorationSupport.create(cloneDestinationPathValidator, SWT.LEFT | SWT.TOP);
 
 		// checkout reused repo button
 		Composite checkoutComposite = new Composite(cloneGroupComposite, SWT.NONE);
-		GridDataFactory.fillDefaults().span(3, 1).indent(20, SWT.DEFAULT).align(SWT.FILL, SWT.FILL).grab(true, true)
-				.applyTo(checkoutComposite);
-		GridLayoutFactory.fillDefaults().numColumns(2).applyTo(checkoutComposite);
+		GridDataFactory.fillDefaults()
+			.span(3,1).indent(20, SWT.DEFAULT).align(SWT.FILL, SWT.FILL).grab(true, true)
+			.applyTo(checkoutComposite);
+		GridLayoutFactory.fillDefaults()
+			.numColumns(2)
+			.applyTo(checkoutComposite);
 		Button checkoutBranchCheckbox = new Button(checkoutComposite, SWT.CHECK);
-		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(checkoutBranchCheckbox);
-		ISWTObservableValue checkoutBranchCheckboxObservable = WidgetProperties.selection()
-				.observe(checkoutBranchCheckbox);
-		ValueBindingBuilder.bind(checkoutBranchCheckboxObservable).validatingAfterConvert(new CheckoutBranchValidator())
-				.to(BeanProperties.value(IGitCloningPageModel.PROPERTY_CHECKOUT_BRANCH_REUSED_REPO).observe(model))
-				.validatingAfterConvert(new CheckoutBranchValidator()).in(dbc);
-		IObservableValue<Boolean> isRepositoryBranchGitRefObservable = BeanProperties
-				.value(IGitCloningPageModel.PROPERTY_IS_REPOSITORY_BRANCH_GIT_REF).observe(model);
+		GridDataFactory.fillDefaults()
+			.align(SWT.LEFT, SWT.CENTER).applyTo(checkoutBranchCheckbox);		
+		ISWTObservableValue checkoutBranchCheckboxObservable = WidgetProperties.selection().observe(checkoutBranchCheckbox);
+		ValueBindingBuilder
+			.bind(checkoutBranchCheckboxObservable)
+			.validatingAfterConvert(new CheckoutBranchValidator())
+			.to(BeanProperties.value(IGitCloningPageModel.PROPERTY_CHECKOUT_BRANCH_REUSED_REPO).observe(model))
+			.validatingAfterConvert(new CheckoutBranchValidator())
+			.in(dbc);
+		IObservableValue<Boolean> isRepositoryBranchGitRefObservable = 
+				BeanProperties.value(IGitCloningPageModel.PROPERTY_IS_REPOSITORY_BRANCH_GIT_REF).observe(model);
 		ComputedValue<Boolean> checkoutBranchEnablement = new ComputedValue<Boolean>() {
 
 			@Override
@@ -183,34 +224,41 @@ protected Boolean calculate() {
 				Boolean isReuseRepoButtonEnabled = (Boolean) reuseRepoButtonEnabled.getValue();
 				Boolean isRepositoryBranchGitRef = isRepositoryBranchGitRefObservable.getValue();
 				Boolean isReuseGitRepository = reuseGitReposityObservable.getValue();
-				return isReuseRepoButtonEnabled && !isRepositoryBranchGitRef && isReuseGitRepository;
+				return isReuseRepoButtonEnabled
+						&& !isRepositoryBranchGitRef
+						&& isReuseGitRepository;
 			}
 		};
 		// checkout branch label
 		Label checkoutBranchLabel = new Label(checkoutComposite, SWT.NONE);
-		GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).grab(true, false).applyTo(checkoutBranchLabel);
+		GridDataFactory.fillDefaults()
+			.align(SWT.LEFT, SWT.CENTER).grab(true, false).applyTo(checkoutBranchLabel);		
 		checkoutBranchLabel.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseUp(MouseEvent e) {
 				checkoutBranchCheckboxObservable.setValue(!checkoutBranchCheckbox.getSelection());
-			}
-		});
-		ValueBindingBuilder.bind(WidgetProperties.text().observe(checkoutBranchLabel))
-				.notUpdating(BeanProperties.value(IGitCloningPageModel.PROPERTY_GIT_REF).observe(model))
-				.converting(new Converter(String.class, String.class) {
-					@Override
-					public Object convert(Object fromObject) {
-						return "Check out branch " + fromObject;
-					}
-				}).in(dbc);
-		ValueBindingBuilder.bind(new WritableValue<Boolean>() {
-
-			@Override
-			public void doSetValue(Boolean value) {
-				checkoutBranchCheckbox.setEnabled(value);
-				checkoutBranchLabel.setEnabled(value);
-			}
-		}).notUpdating(checkoutBranchEnablement).in(dbc);
+			}});
+		ValueBindingBuilder
+			.bind(WidgetProperties.text().observe(checkoutBranchLabel))
+			.notUpdating(BeanProperties.value(IGitCloningPageModel.PROPERTY_GIT_REF).observe(model))
+			.converting(new Converter(String.class, String.class) {
+				@Override
+				public Object convert(Object fromObject) {
+					return "Check out branch " + fromObject;
+				}
+			})
+			.in(dbc);
+		ValueBindingBuilder
+			.bind(new WritableValue<Boolean>() {
+
+				@Override
+				public void doSetValue(Boolean value) {
+					checkoutBranchCheckbox.setEnabled(value);
+					checkoutBranchLabel.setEnabled(value);
+				}
+			})	
+			.notUpdating(checkoutBranchEnablement)
+			.in(dbc);
 
 		return cloneGroup;
 	}
@@ -250,8 +298,8 @@ private class CloneDestinationPathValidator extends MultiValidator {
 		private final IObservableValue<Boolean> reuseGitCloneObservable;
 		private final IObservableValue<File> repoPathObservable;
 
-		public CloneDestinationPathValidator(IObservableValue<Boolean> useDefaultCloneDestinationObservable,
-				IObservableValue<String> cloneDestinationObservable, IObservableValue<Boolean> skipCloneObservable,
+		public CloneDestinationPathValidator(IObservableValue<Boolean> useDefaultCloneDestinationObservable, 
+				IObservableValue<String> cloneDestinationObservable, IObservableValue<Boolean> skipCloneObservable, 
 				IObservableValue<File> repoPathObservable) {
 			this.useDefaultCloneDestinationObservable = useDefaultCloneDestinationObservable;
 			this.cloneDestinationObservable = cloneDestinationObservable;
@@ -268,13 +316,14 @@ protected IStatus validate() {
 			final File repoPath = repoPathObservable.getValue();
 
 			final IPath cloneDestinationPath = new Path(cloneDestination);
-			if (cloneDestinationPath.isEmpty() || !cloneDestinationPath.isAbsolute()) {
+			if (cloneDestinationPath.isEmpty()
+					|| !cloneDestinationPath.isAbsolute()) {
 				return ValidationStatus.cancel("You need to provide an absolute path that we'll clone to.");
 			}
 
 			if (!FileUtils.canWrite(cloneDestinationPath.toOSString())) {
-				return ValidationStatus
-						.error(NLS.bind("The location {0} is not writeable.", cloneDestinationPath.toOSString()));
+				return ValidationStatus.error(
+						NLS.bind("The location {0} is not writeable.", cloneDestinationPath.toOSString()));
 			}
 
 			boolean cloneDestinationExists = FileUtils.exists(repoPath);
@@ -287,10 +336,10 @@ protected IStatus validate() {
 
 		private IStatus validateClone(final IPath cloneDestinationPath, boolean cloneDestinationExists) {
 			if (cloneDestinationExists) {
-				return ValidationStatus.error(NLS.bind(
-						"There already is a folder named \"{0}\" in \"{1}\".\n"
+				return ValidationStatus.error(
+						NLS.bind("There already is a folder named \"{0}\" in \"{1}\".\n"
 								+ "Please choose a different destination, or select 'Reuse existing repository'.",
-						model.getRepoName(), cloneDestinationPath.toOSString()));
+								model.getRepoName(), cloneDestinationPath.toOSString()));
 			}
 			return ValidationStatus.ok();
 		}
@@ -298,37 +347,37 @@ private IStatus validateClone(final IPath cloneDestinationPath, boolean cloneDes
 		private IStatus validateReuseGitRepo(final File repoPath, final IPath cloneDestinationPath,
 				boolean cloneDestinationExists) {
 			if (!cloneDestinationExists) {
-				return ValidationStatus.error(NLS.bind(
-						"There is no folder named \"{0}\" in \"{1}\"\n"
+				return ValidationStatus.error(
+						NLS.bind("There is no folder named \"{0}\" in \"{1}\"\n"
 								+ "Please clone the repository or browse to a location containing the repository.",
-						model.getRepoName(), cloneDestinationPath.toOSString()));
+								model.getRepoName(), cloneDestinationPath.toOSString()));
 			}
 
 			if (!EGitUtils.isRepository(repoPath)) {
-				return ValidationStatus.error(NLS.bind(
-						"There already is a folder named \"{0}\" in \"{1}\" but it isnt a git repository.\n"
+				return ValidationStatus.error(
+						NLS.bind("There already is a folder named \"{0}\" in \"{1}\" but it isnt a git repository.\n"
 								+ "Please remove this folder or use a different location.",
-						model.getRepoName(), cloneDestinationPath.toOSString()));
-			}
+								model.getRepoName(), cloneDestinationPath.toOSString()));
+			} 
 
 			if (!hasRemoteUrl(model.getGitUrl(), cloneDestinationPath)) {
 				return ValidationStatus.warning(NLS.bind(
 						"The reused git repository has no remote to {2}. "
 								+ "It does not seem to match the source that is used in your OpenShift application.",
-						new String[] { model.getRepoName(), cloneDestinationPath.toOSString(), model.getGitUrl() }));
+						new String[] { model.getRepoName(), cloneDestinationPath.toOSString(),
+								model.getGitUrl() }));
 			}
 			return ValidationStatus.ok();
 		}
 
 		private boolean hasRemoteUrl(final String gitUrl, final IPath repoResourcePath) {
 			try {
-				return EGitUtils.hasRemoteUrl(Pattern.compile(RegExUtils.escapeRegex(gitUrl)), model.getRepository());
+				return EGitUtils.hasRemoteUrl(
+						Pattern.compile(RegExUtils.escapeRegex(gitUrl)), model.getRepository());
 			} catch (CoreException e) {
-				OpenShiftUIActivator.getDefault().getLog()
-						.log(StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
-								NLS.bind("Could not inspect remotes for git repo {0} at {1}.",
-										model.getCloneDestination(), repoResourcePath.toOSString()),
-								e));
+				OpenShiftUIActivator.getDefault().getLog().log(StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
+					NLS.bind("Could not inspect remotes for git repo {0} at {1}.", 
+						model.getCloneDestination(), repoResourcePath.toOSString()), e));
 				return false;
 			}
 		}
@@ -355,10 +404,13 @@ public IStatus validate(Object value) {
 
 			boolean checkoutBranch = (boolean) value;
 			Repository repository = model.getRepository();
-			if (checkoutBranch && repository != null && !isCurrentBranch(model.getGitRef(), repository)) {
-				return ValidationStatus
-						.warning(NLS.bind("Branch {0} will be checked out in the reused git repository.\n"
-								+ "Please make sure it is clean.", model.getGitRef()));
+			if (checkoutBranch 
+					&& repository != null
+					&& !isCurrentBranch(model.getGitRef(), repository)) {
+				return ValidationStatus.warning(
+						NLS.bind("Branch {0} will be checked out in the reused git repository.\n"
+								+ "Please make sure it is clean.",
+								model.getGitRef()));
 			}
 			return ValidationStatus.ok();
 		}
@@ -372,17 +424,20 @@ private boolean isCurrentBranch(String gitRef, Repository repository) {
 				String branch = EGitUtils.getCurrentBranch(repository);
 				return gitRef.equals(branch);
 			} catch (CoreException e) {
-				OpenShiftUIActivator.getDefault().getLog().log(StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
-						NLS.bind("Could not get current branch in repository at {0} .", repository.getDirectory()), e));
-				return false;
+				OpenShiftUIActivator.getDefault().getLog().log(
+						StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
+								NLS.bind("Could not get current branch in repository at {0} .", 
+										repository.getDirectory()), e));
+					return false;
 			}
 		}
 
 	}
-
+	
 	@Override
 	protected void setupWizardPageSupport(DataBindingContext dbc) {
-		ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.INFO | IStatus.CANCEL, this, dbc);
+		ParametrizableWizardPageSupport.create(
+				IStatus.ERROR | IStatus.INFO | IStatus.CANCEL, this, dbc);
 	}
 
 	@Override
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/ImportApplicationWizardModel.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/ImportApplicationWizardModel.java
index 6abace8bab..a6e0cfadaa 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/ImportApplicationWizardModel.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/importapp/ImportApplicationWizardModel.java
@@ -12,7 +12,10 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -29,11 +32,14 @@
 import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
 import org.jboss.tools.openshift.internal.core.util.ResourceUtils;
 import org.jboss.tools.openshift.internal.ui.treeitem.ObservableTreeItem;
+import org.jboss.tools.openshift.internal.ui.utils.ResourceParametersUtils;
 import org.jboss.tools.openshift.internal.ui.wizard.importapp.BuildConfigTreeItems.ConnectionTreeItem;
 
 import com.openshift.restclient.model.IBuildConfig;
 import com.openshift.restclient.model.IProject;
 import com.openshift.restclient.model.build.IGitBuildSource;
+import com.openshift.restclient.model.template.IParameter;
+import com.openshift.restclient.model.template.ITemplate;
 
 /**
  * @author Andre Dietisheim
@@ -59,7 +65,9 @@ public class ImportApplicationWizardModel extends ObservableUIPojo
 
 	private List<ObservableTreeItem> buildConfigs = new ArrayList<>();
 	private boolean isRepositoryBranchGitRef;
-
+	
+	private Map<String, IParameter> templateParameters = Collections.emptyMap();
+	
 	public ImportApplicationWizardModel() {
 		this.useDefaultCloneDestination = true;
 		this.cloneDestination = getDefaultCloneDestination();
@@ -73,6 +81,8 @@ private void update(Connection connection, Object selectedItem, String cloneDest
 		Object oldSelectedItem = this.selectedItem;
 		updateSelectedItem(selectedItem);
 		updateUseDefaultCloneDestination(useDefaultCloneDestination);
+		
+		cloneDestination = getParametrisedTemplateValue(cloneDestination);
 		updateCloneDestination(cloneDestination);
 		IBuildConfig buildConfig = getBuildConfig(selectedItem);
 		String repoName = updateRepoName(buildConfig);
@@ -104,10 +114,10 @@ private String updateRepoName(IBuildConfig config) {
 		return name;
 	}
 
-	private static String getRepoName(IBuildConfig config) {
+	private String getRepoName(IBuildConfig config) {
 		String repoName = null;
 		if (config != null) {
-			repoName = ResourceUtils.getProjectNameForURI(config.getSourceURI());
+			repoName = ResourceUtils.getProjectNameForURI(getParametrisedTemplateValue(config.getSourceURI()));
 		}
 		return repoName;
 	}
@@ -184,7 +194,7 @@ private void updateGitContextDir(String newGitContextDir, IBuildConfig newBuildC
 				return;
 			}
 		} else {
-			newGitContextDir = getGitContextDir(newBuildConfig);
+			newGitContextDir = getParametrisedTemplateValue(getGitContextDir(newBuildConfig));
 		}
 
 		firePropertyChange(PROPERTY_GIT_CONTEXT_DIR, this.gitContextDir, this.gitContextDir = newGitContextDir);
@@ -213,7 +223,7 @@ public String getGitUrl() {
 		if (config == null) {
 			return null;
 		} else {
-			return config.getSourceURI();
+			return getParametrisedTemplateValue(config.getSourceURI());
 		}
 	}
 
@@ -227,7 +237,7 @@ protected String getGitRef(IBuildConfig config) {
 		if (config != null && config.getBuildSource() instanceof IGitBuildSource) {
 			gitRef = ((IGitBuildSource) config.getBuildSource()).getRef();
 		}
-		return gitRef;
+		return getParametrisedTemplateValue(gitRef);
 	}
 
 	@Override
@@ -418,4 +428,12 @@ public void setCheckoutBranchReusedRepo(boolean checkout) {
 		update(this.connection, this.selectedItem, this.cloneDestination, this.useDefaultCloneDestination, this.project,
 				this.reuseGitRepo, checkout, this.gitContextDir);
 	}
+	
+	private String getParametrisedTemplateValue(String parameter) {
+	    return ResourceParametersUtils.replaceParametersInString(this.templateParameters, parameter);
+	}
+	
+	public void setTemplateParameters(Map<String, IParameter> templateParameters) {
+	    this.templateParameters = templateParameters;
+	}
 }
\ No newline at end of file
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ImportApplicationDetailsPage.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ImportApplicationDetailsPage.java
new file mode 100644
index 0000000000..175b8168a7
--- /dev/null
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ImportApplicationDetailsPage.java
@@ -0,0 +1,197 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.internal.ui.wizard.newapp;
+
+
+import static org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIConstants.IMPORT_APPLICATION_DIALOG_SETTINGS_KEY;
+import static org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIConstants.REPO_PATH_KEY;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.databinding.validation.MultiValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.DialogSettings;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.layout.TreeColumnLayout;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.openshift.internal.common.ui.utils.UIUtils;
+import org.jboss.tools.openshift.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.GitCloningWizardPage;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.ImportApplicationWizardModel;
+
+import com.openshift.restclient.ResourceKind;
+import com.openshift.restclient.model.IBuildConfig;
+import com.openshift.restclient.model.IResource;
+import com.openshift.restclient.model.template.IParameter;
+import com.openshift.restclient.model.template.ITemplate;
+
+public class ImportApplicationDetailsPage extends GitCloningWizardPage {
+    
+    private NewApplicationWizardModel applicationSourceModel;
+    private ImportApplicationWizardModel importApplicationWizardModel;
+    private BuildConfigSelectedValidator buildConfigSelectedValidator;
+    
+    private ResourceDetailsLabelProvider buildConfigTreeLabelProvider;
+    
+    public static final String PAGE_NAME = "Import application details";
+
+    protected ImportApplicationDetailsPage(IWizard wizard, NewApplicationWizardModel applicationSourceModel) {
+        super("Import application", "Configure the project settings", PAGE_NAME, wizard, new ImportApplicationWizardModel());
+        this.applicationSourceModel = applicationSourceModel;
+        this.importApplicationWizardModel = (ImportApplicationWizardModel)model;
+        
+        this.importApplicationWizardModel.setConnection(applicationSourceModel.getConnection());
+        String repoPath = loadRepoPath();
+        if (StringUtils.isNotBlank(repoPath)) {
+            importApplicationWizardModel.setCloneDestination(repoPath);
+            importApplicationWizardModel.setUseDefaultCloneDestination(false);
+        }
+    }
+    
+    private String loadRepoPath() {
+        if (getDialogSettings() == null || getDialogSettings().get(REPO_PATH_KEY) == null) {
+            IDialogSettings settings = DialogSettings.getOrCreateSection(
+                    OpenShiftUIActivator.getDefault().getDialogSettings(), IMPORT_APPLICATION_DIALOG_SETTINGS_KEY);
+            return settings.get(REPO_PATH_KEY);
+        }
+        return getDialogSettings().get(REPO_PATH_KEY);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void doCreateControls(Composite parent, DataBindingContext dbc) {
+        GridLayoutFactory.fillDefaults().applyTo(parent);
+        Button isImportApplicationButton = new Button(parent, SWT.CHECK);
+        isImportApplicationButton.setText("Import application into the workspace");
+        isImportApplicationButton.setToolTipText("Uncheck if you don't want to import application into the workspace");
+        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(false, false).applyTo(isImportApplicationButton);
+        
+        Composite gitCloneComposite = new Composite(parent, SWT.NONE);
+        TreeViewer buildConfigsTreeViewer = createTable(gitCloneComposite, dbc);
+
+        GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(gitCloneComposite);
+        super.doCreateControls(gitCloneComposite, dbc);
+        
+        isImportApplicationButton.addSelectionListener(new SelectionAdapter() {
+
+            @Override
+            public void widgetSelected(SelectionEvent event) {
+                UIUtils.enableAllChildren(((Button)event.getSource()).getSelection(), gitCloneComposite);
+            }
+            
+        });
+        
+        //set buildConfigsTreeViewer content based on selected template
+        IObservableValue<IApplicationSource> selectedAppSourceObservable = 
+                BeanProperties.value(IApplicationSourceListPageModel.PROPERTY_SELECTED_APP_SOURCE).observe(applicationSourceModel);
+        selectedAppSourceObservable.addValueChangeListener(new IValueChangeListener<IApplicationSource>() {
+
+            @Override
+            public void handleValueChange(ValueChangeEvent<? extends IApplicationSource> event) {
+                IApplicationSource appSource = event.getObservableValue().getValue();
+                Collection<IResource> buildConfigs = getBuildConfigsFromApplicationSource(appSource);
+                buildConfigsTreeViewer.setInput(buildConfigs);
+                UIUtils.enableAllChildren(!buildConfigs.isEmpty(), parent);
+                isImportApplicationButton.setSelection(!buildConfigs.isEmpty());
+                if (buildConfigs.isEmpty()) {
+                    setMessage("No build configs were found in your template, so you can't import application right now.", IMessageProvider.WARNING);
+                }
+                
+                Map<String, IParameter> templateParameters = ((ITemplate)appSource.getSource()).getParameters();
+                importApplicationWizardModel.setTemplateParameters(templateParameters);
+                
+                buildConfigTreeLabelProvider = new ResourceDetailsLabelProvider(templateParameters);
+                buildConfigsTreeViewer.setLabelProvider(buildConfigTreeLabelProvider);
+            }
+
+        });
+    }
+    
+    private Collection<IResource> getBuildConfigsFromApplicationSource(IApplicationSource appSource) {
+        Collection<IResource> buildConfigs = Collections.emptyList();
+        if (appSource != null && appSource.getSource() instanceof ITemplate) {
+            ITemplate template = appSource.getSource();
+            buildConfigs = template.getObjects().stream()
+                    .filter(resource -> ResourceKind.BUILD_CONFIG.equals(resource.getKind())).collect(Collectors.toList());
+        }
+        return buildConfigs;
+    }
+    
+    private TreeViewer createTable(Composite parent, DataBindingContext dbc) {
+        Composite tableContainer = new Composite(parent, SWT.NONE);
+        GridDataFactory.fillDefaults()
+            .align(SWT.FILL, SWT.FILL)
+            .grab(true, false)
+            .hint(400, 150).applyTo(tableContainer);
+
+        TreeColumnLayout treeLayout = new TreeColumnLayout();
+        tableContainer.setLayout(treeLayout);
+        TreeViewer viewer = new TreeViewer(tableContainer, SWT.BORDER  | SWT.V_SCROLL | SWT.H_SCROLL);
+        viewer.setContentProvider(new ResourceDetailsContentProvider());
+        
+        viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+            
+            @Override
+            public void selectionChanged(SelectionChangedEvent event) {
+                if (event.getStructuredSelection() != null 
+                        && ((ITreeSelection)event.getStructuredSelection()).getPaths() != null
+                        && ((ITreeSelection)event.getStructuredSelection()).getPaths().length > 0) {
+                    importApplicationWizardModel.setSelectedItem(
+                            ((ITreeSelection)event.getStructuredSelection()).getPaths()[0].getFirstSegment());
+                }
+                buildConfigSelectedValidator.forceRevalidate();
+            }
+        });
+        
+        dbc.addValidationStatusProvider(this.buildConfigSelectedValidator = new BuildConfigSelectedValidator());
+        
+        return viewer;
+    }
+    
+    private class BuildConfigSelectedValidator extends MultiValidator {
+
+        @Override
+        protected IStatus validate() {
+            if (importApplicationWizardModel.getSelectedItem() == null) {
+                return ValidationStatus.error("Please, select a build config");
+            }
+            return ValidationStatus.ok();
+        }
+        
+        public void forceRevalidate() {
+            revalidate();
+        }
+        
+    }
+
+}
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java
index 1919ffe651..41d3cd77a1 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java
@@ -9,6 +9,7 @@
 package org.jboss.tools.openshift.internal.ui.wizard.newapp;
 
 import static org.jboss.tools.common.ui.WizardUtils.runInWizard;
+import static org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIConstants.IMPORT_APPLICATION_DIALOG_SETTINGS_KEY;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -20,11 +21,14 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -43,6 +47,7 @@
 import org.jboss.tools.openshift.core.util.OpenShiftResourceUniqueId;
 import org.jboss.tools.openshift.internal.common.core.UsageStats;
 import org.jboss.tools.openshift.internal.common.core.job.JobChainBuilder;
+import org.jboss.tools.openshift.internal.common.ui.OpenShiftCommonUIActivator;
 import org.jboss.tools.openshift.internal.common.ui.utils.OpenShiftUIUtils;
 import org.jboss.tools.openshift.internal.common.ui.utils.UIUtils;
 import org.jboss.tools.openshift.internal.common.ui.wizard.IConnectionAwareWizard;
@@ -55,7 +60,10 @@
 import org.jboss.tools.openshift.internal.ui.wizard.common.ResourceLabelsPage;
 import org.jboss.tools.openshift.internal.ui.wizard.deployimage.DeploymentConfigPage;
 import org.jboss.tools.openshift.internal.ui.wizard.deployimage.ServicesAndRoutingPage;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.BuildConfigWizardPage;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.GitCloningWizardPage;
 import org.jboss.tools.openshift.internal.ui.wizard.importapp.ImportApplicationWizard;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.ImportApplicationWizardModel;
 import org.jboss.tools.openshift.internal.ui.wizard.newapp.fromimage.ApplicationSourceFromImageModel;
 import org.jboss.tools.openshift.internal.ui.wizard.newapp.fromimage.BuildConfigPage;
 import org.jboss.tools.openshift.internal.ui.wizard.newapp.fromtemplate.ApplicationSourceFromTemplateModel;
@@ -76,8 +84,11 @@
  * @author Andre Dietisheim
  * @author Jeff Maury
  */
-public class NewApplicationWizard extends Wizard implements IWorkbenchWizard, IConnectionAwareWizard<Connection> {
+public class NewApplicationWizard 
+	extends Wizard 
+	implements IWorkbenchWizard, IConnectionAwareWizard<Connection> {
 
+    private ImportApplicationWizard importApplicationWizard;
 	private NewApplicationWizardModel model = new NewApplicationWizardModel();
 	private ApplicationSourceFromTemplateModel fromTemplateModel = new ApplicationSourceFromTemplateModel();
 	private ApplicationSourceFromImageModel fromImageModel = new ApplicationSourceFromImageModel();
@@ -85,8 +96,8 @@ public class NewApplicationWizard extends Wizard implements IWorkbenchWizard, IC
 	public NewApplicationWizard() {
 		setWindowTitle("New OpenShift Application");
 		setNeedsProgressMonitor(true);
-
-		Stream.of(fromTemplateModel, fromImageModel).forEach(m -> {
+		
+		Stream.of(fromTemplateModel, fromImageModel).forEach(m->{
 			model.addPropertyChangeListener(IApplicationSourceListPageModel.PROPERTY_SELECTED_APP_SOURCE, m);
 			model.addPropertyChangeListener(IApplicationSourceListPageModel.PROPERTY_ECLIPSE_PROJECT, m);
 			model.addPropertyChangeListener(IApplicationSourceListPageModel.PROPERTY_PROJECT, m);
@@ -96,14 +107,14 @@ public NewApplicationWizard() {
 
 	@Override
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fromImageModel.setContainer(getContainer());
-		if (selection == null || selection.isEmpty()) {
+        fromImageModel.setContainer(getContainer());
+		if (selection == null
+				|| selection.isEmpty()) {
 			return;
 		}
-		org.eclipse.core.resources.IProject selectedProject = UIUtils.getFirstElement(selection,
-				org.eclipse.core.resources.IProject.class);
+		org.eclipse.core.resources.IProject selectedProject = UIUtils.getFirstElement(selection, org.eclipse.core.resources.IProject.class);
 		model.setEclipseProject(selectedProject);
-
+		
 		Connection connection = UIUtils.getFirstElement(selection, Connection.class);
 		if (connection != null) {
 			setConnection(connection);
@@ -113,9 +124,9 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
 				connection = ConnectionsRegistryUtil.safeGetConnectionFor(resource);
 				setConnection(connection);
 				model.setProject(resource.getProject());
-			}
+			} 
 		}
-		if (connection != null) {
+		if(connection != null) {
 			ConnectionsRegistrySingleton.getInstance().setRecent(connection);
 		}
 	}
@@ -127,7 +138,7 @@ public void addPages() {
 		 *   |                                                    |
 		 *    ----> buildconfig -> deployconfig -> serviceconfig -|
 		 */
-
+		
 		//app from image
 		BuildConfigPage bcPage = new BuildConfigPage(this, fromImageModel) {
 			@Override
@@ -147,18 +158,20 @@ public boolean isPageComplete() {
 			public boolean isPageComplete() {
 				return isTemplateFlow() ? true : super.isPageComplete();
 			}
-
+			
 		};
 
 		//app from template
 		TemplateParametersPage paramPage = new TemplateParametersPage(this, fromTemplateModel) {
-
+			
 			@Override
 			public boolean isPageComplete() {
-				return isTemplateFlow() ?
-				//force visiting parameters page
-				getContainer() != null && !(getContainer().getCurrentPage() instanceof ApplicationSourceListPage)
-						&& super.isPageComplete() : true;
+				return isTemplateFlow() ? 
+						//force visiting parameters page
+						getContainer() != null 
+						&& !(getContainer().getCurrentPage() instanceof ApplicationSourceListPage) 
+						&& super.isPageComplete()  
+						: true;
 			}
 
 			@Override
@@ -167,8 +180,6 @@ public IWizardPage getNextPage() {
 			}
 		};
 
-		ResourceLabelsPage labelsPage = new ResourceLabelsPage(this, model);
-
 		ApplicationSourceListPage listPage = new ApplicationSourceListPage(this, model) {
 
 			@Override
@@ -178,15 +189,35 @@ public IWizardPage getNextPage() {
 				}
 				return getPage(BuildConfigPage.PAGE_NAME);
 			}
-
+			
 		};
-
+		
+		ResourceLabelsPage labelsPage = new ResourceLabelsPage(this, model) {
+		    
+		    @Override
+		    public IWizardPage getNextPage() {
+		        if (isTemplateFlow()) {
+		            return getPage(ImportApplicationDetailsPage.PAGE_NAME);
+		        }
+		        return null;
+		    }
+		};
+		
 		addPage(listPage);
 		addPage(paramPage);
 		addPage(bcPage);
 		addPage(dcPage);
 		addPage(servicesPage);
 		addPage(labelsPage);
+		
+		if (isTemplateFlow()) {	    
+		    //this.importApplicationWizard = new ImportApplicationWizard();
+		    setDialogSettings(DialogSettings.getOrCreateSection(OpenShiftCommonUIActivator.getDefault().getDialogSettings(),
+	                IMPORT_APPLICATION_DIALOG_SETTINGS_KEY));
+		    ImportApplicationDetailsPage importApplicationDetailsPage = new ImportApplicationDetailsPage(this, model);
+	        //this.importApplicationWizard.addPage(importApplicationDetailsPage);
+	        addPage(importApplicationDetailsPage/*this.importApplicationWizard.getPage(ImportApplicationDetailsPage.PAGE_NAME)*/);
+		}
 	}
 
 	@Override
@@ -201,7 +232,7 @@ public void dispose() {
 	}
 
 	private boolean isTemplateFlow() {
-		if (model.getSelectedAppSource() != null && model.getSelectedAppSource().getSource() != null) {
+		if(model.getSelectedAppSource() != null && model.getSelectedAppSource().getSource() != null) {
 			return ResourceKind.TEMPLATE.equals(model.getSelectedAppSource().getSource().getKind());
 		}
 		return true;
@@ -210,123 +241,132 @@ private boolean isTemplateFlow() {
 	@Override
 	public boolean performFinish() {
 
-		final IResourcesModelJob createJob = isTemplateFlow() ? fromTemplateModel.createFinishJob()
+		final IResourcesModelJob createJob = isTemplateFlow()
+				? fromTemplateModel.createFinishJob() 
 				: fromImageModel.createFinishJob();
-
-		createJob.addJobChangeListener(new JobChangeAdapter() {
-
-			@Override
-			public void done(IJobChangeEvent event) {
-				IStatus status = event.getResult();
-				if (JobUtils.isOk(status) || JobUtils.isWarning(status)) {
-					Display.getDefault().syncExec(createJob.getSummaryRunnable(getShell()));
-					OpenShiftUIUtils.showOpenShiftExplorer();
-					if (model.getEclipseProject() != null) {
-						//No need to import the project from git, it's already here
-						return;
-					}
-					Collection<IResource> resources = createJob.getResources();
-					final Map<IProject, Collection<IBuildConfig>> projectsAndBuildConfigs = getBuildConfigs(resources);
-					if (projectsAndBuildConfigs.isEmpty()) {
-						return;
-					}
-					Connection connection = model.getConnection();
-					Display.getDefault().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							ImportApplicationWizard wizard = new ImportApplicationWizard(projectsAndBuildConfigs);
-							wizard.addImportJobChangeListener(new JobChangeAdapter() {
-
-								@Override
-								public void done(IJobChangeEvent event) {
-									IService service = getService(resources);
-									List<org.eclipse.core.resources.IProject> importedProjects = wizard.getImportJob()
-											.getImportedProjects();
-									if (service != null && importedProjects.size() == 1) {
-										Display.getDefault().asyncExec(new Runnable() {
-
-											@Override
-											public void run() {
-												if (MessageDialog.openQuestion(getShell(), "Create server adapter",
-														NLS.bind(
-																"Would you like to create a server adapter for the imported {0} project?",
-																importedProjects.get(0).getName()))) {
-													createServerAdapter(importedProjects.get(0), connection, service,
-															getRoute(resources));
-												}
-											}
-										});
-									}
-								}
-							});
-							new WizardDialog(getShell(), wizard).open();
-						}
-					});
-				}
-			}
-
-			protected Map<IProject, Collection<IBuildConfig>> getBuildConfigs(Collection<IResource> resources) {
-				Map<IProject, Collection<IBuildConfig>> projects = new LinkedHashMap<>();
-				for (IResource resource : resources) {
-					if (resource instanceof IBuildConfig) {
-						IBuildConfig buildConfig = (IBuildConfig) resource;
-						if (StringUtils.isNotBlank(buildConfig.getSourceURI())) {
-							IProject p = buildConfig.getProject();
-							Collection<IBuildConfig> buildConfigs = projects.get(p);
-							if (buildConfigs == null) {
-								buildConfigs = new LinkedHashSet<>();
-								projects.put(p, buildConfigs);
-							}
-							buildConfigs.add(buildConfig);
-						}
-					}
-				}
-				return projects;
-			}
-
-			protected IService getService(Collection<IResource> resources) {
-				IResource service = getResourceOfType(resources, IService.class);
-				return service == null ? null : (IService) service;
-			}
-
-			protected IRoute getRoute(Collection<IResource> resources) {
-				IResource route = getResourceOfType(resources, IRoute.class);
-				return route == null ? null : (IRoute) route;
-			}
-
-			private IResource getResourceOfType(Collection<IResource> resources, Class<? extends IResource> type) {
-				for (IResource resource : resources) {
-					if (type.isInstance(resource)) {
-						return resource;
-					}
-				}
-				return null;
-			}
-
-			protected void createServerAdapter(org.eclipse.core.resources.IProject project, Connection connection,
-					IService service, IRoute route) {
-				try {
-					IServerWorkingCopy server = OpenShiftServerUtils.create(OpenShiftResourceUniqueId.get(service));
-					ServerSettingsWizardPageModel serverModel = new ServerSettingsWizardPageModel(service, route,
-							project, connection, server,
-							OCBinary.getInstance().getStatus(connection, new NullProgressMonitor()));
-					serverModel.loadResources();
-					serverModel.updateServer();
-					server.setAttribute(OpenShiftServerUtils.SERVER_START_ON_CREATION, false);
-					serverModel.saveServer(null);
-				} catch (CoreException ce) {
-					OpenShiftUIActivator.getDefault().getLogger()
-							.logError("Error occured while creating a server adapter", ce);
-					return;
-				}
-			}
-		});
-
+		
+//		createJob.addJobChangeListener(new JobChangeAdapter() {
+//
+//			@Override
+//			public void done(IJobChangeEvent event) {
+//				IStatus status = event.getResult();
+//				if(JobUtils.isOk(status) 
+//						|| JobUtils.isWarning(status)) {
+//					Display.getDefault().syncExec(createJob.getSummaryRunnable(getShell()));
+//					OpenShiftUIUtils.showOpenShiftExplorer();
+//					if (model.getEclipseProject() != null) {
+//						//No need to import the project from git, it's already here
+//						return;
+//					}
+//					Collection<IResource> resources = createJob.getResources();
+//					final Map<IProject, Collection<IBuildConfig>> projectsAndBuildConfigs = getBuildConfigs(resources);
+//					if (projectsAndBuildConfigs.isEmpty()) {
+//						return;
+//					}
+//					Connection connection = model.getConnection();
+//					Display.getDefault().asyncExec(new Runnable() {
+//						@Override
+//						public void run() {
+//							ImportApplicationWizard wizard = new ImportApplicationWizard(projectsAndBuildConfigs);
+//							wizard.addImportJobChangeListener(new JobChangeAdapter() {
+//								
+//								@Override
+//								public void done(IJobChangeEvent event) {
+//									IService service = getService(resources);
+//									List<org.eclipse.core.resources.IProject> importedProjects = wizard.getImportJob().getImportedProjects();
+//									if (service != null && importedProjects.size() == 1) {
+//										Display.getDefault().asyncExec(new Runnable() {
+//
+//								            @Override
+//								            public void run() {
+//								            	if (MessageDialog.openQuestion(getShell(), "Create server adapter", NLS.bind(
+//														"Would you like to create a server adapter for the imported {0} project?",
+//														importedProjects.get(0).getName()))) {
+//								            		createServerAdapter(importedProjects.get(0), connection, service, getRoute(resources));
+//								            	}
+//								            }
+//										});
+//									}
+//								}
+//							});
+//							new WizardDialog(getShell(), wizard).open();
+//						}
+//					});
+//				}
+//			}
+//			
+//			protected Map<IProject, Collection<IBuildConfig>> getBuildConfigs(Collection<IResource> resources) {
+//				Map<IProject, Collection<IBuildConfig>> projects = new LinkedHashMap<>();
+//				for (IResource resource : resources) {
+//					if (resource instanceof IBuildConfig) {
+//						IBuildConfig buildConfig = (IBuildConfig)resource;
+//						if (StringUtils.isNotBlank(buildConfig.getSourceURI())) {
+//							IProject p = buildConfig.getProject();
+//							Collection<IBuildConfig> buildConfigs = projects.get(p);
+//							if (buildConfigs == null) {
+//								buildConfigs = new LinkedHashSet<>();
+//								projects.put(p, buildConfigs);
+//							}
+//							buildConfigs.add(buildConfig);
+//						}
+//					}
+//				}
+//				return projects;
+//			}
+//			
+//			protected IService getService(Collection<IResource> resources) {
+//				IResource service = getResourceOfType(resources, IService.class);
+//				return service == null ? null : (IService)service;
+//			}
+//			
+//			protected IRoute getRoute(Collection<IResource> resources) {
+//				IResource route = getResourceOfType(resources, IRoute.class);
+//				return route == null ? null : (IRoute)route;
+//			}
+//			
+//			private IResource getResourceOfType(Collection<IResource> resources, Class<? extends IResource> type) {
+//				for (IResource resource : resources) {
+//					if (type.isInstance(resource)) {
+//						return resource;
+//					}
+//				}
+//				return null;
+//			}
+//			
+//			protected void createServerAdapter(org.eclipse.core.resources.IProject project, Connection connection, IService service, IRoute route) {
+//				try {
+//					IServerWorkingCopy server = OpenShiftServerUtils.create(OpenShiftResourceUniqueId.get(service));
+//					ServerSettingsWizardPageModel serverModel = new ServerSettingsWizardPageModel(service, route,
+//							project, connection, server,
+//							OCBinary.getInstance().getStatus(connection, new NullProgressMonitor()));
+//					serverModel.loadResources();
+//					serverModel.updateServer();
+//					server.setAttribute(OpenShiftServerUtils.SERVER_START_ON_CREATION, false);
+//					serverModel.saveServer(null);
+//				} catch(CoreException ce) {
+//					OpenShiftUIActivator.getDefault().getLogger().logError("Error occured while creating a server adapter", ce);
+//					return;
+//				}
+//			}
+//		});
+		
 		boolean success = false;
 		try {
 			Job job = new JobChainBuilder(createJob.getJob())
-					.runWhenSuccessfullyDone(new RefreshResourcesJob(createJob, true)).build();
-			IStatus status = runInWizard(job, createJob.getDelegatingProgressMonitor(), getContainer());
+					.runWhenSuccessfullyDone(new RefreshResourcesJob(createJob, true)).runWhenDone(new Job("Import application") {
+
+                        @Override
+                        protected IStatus run(IProgressMonitor monitor) {
+                            if (importApplicationWizard.performFinish()) {
+                                return new Status(Status.OK, OpenShiftUIActivator.PLUGIN_ID, "Application imported");
+                            } else {
+                                return new Status(Status.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Application import failed"); 
+                            }
+                        }}).build();
+			IStatus status = runInWizard(
+					job, 
+					createJob.getDelegatingProgressMonitor(), 
+					getContainer());
 			success = isFailed(status);
 		} catch (InvocationTargetException | InterruptedException e) {
 			OpenShiftUIActivator.getDefault().getLogger().logError(e);
@@ -338,7 +378,8 @@ protected void createServerAdapter(org.eclipse.core.resources.IProject project,
 	}
 
 	private boolean isFailed(IStatus status) {
-		return JobUtils.isOk(status) || JobUtils.isWarning(status);
+		return JobUtils.isOk(status) 
+				|| JobUtils.isWarning(status);
 	}
 
 	@Override
@@ -354,7 +395,7 @@ public boolean hasConnection() {
 	@Override
 	public void setConnection(Connection connection) {
 		model.setConnection(connection);
-		if (model == null || fromImageModel == null) {
+		if(model == null || fromImageModel == null) {
 			//wizard is disposed by canceling the creation of a required project;
 			return;
 		}
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java
index 0171c45c0c..fe40cc7da7 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java
@@ -12,6 +12,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -32,14 +33,17 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.jgit.lib.Repository;
 import org.eclipse.osgi.util.NLS;
 import org.jboss.tools.foundation.core.plugin.log.StatusFactory;
 import org.jboss.tools.openshift.common.core.utils.VariablesHelper;
 import org.jboss.tools.openshift.core.connection.Connection;
+import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
 import org.jboss.tools.openshift.internal.ui.OpenShiftUIActivator;
 import org.jboss.tools.openshift.internal.ui.OpenshiftUIConstants;
 import org.jboss.tools.openshift.internal.ui.treeitem.ObservableTreeItem;
 import org.jboss.tools.openshift.internal.ui.wizard.common.ResourceLabelsPageModel;
+import org.jboss.tools.openshift.internal.ui.wizard.importapp.IGitCloningPageModel;
 import org.jboss.tools.openshift.internal.ui.wizard.newapp.fromtemplate.TemplateApplicationSource;
 
 import com.openshift.restclient.IResourceFactory;
@@ -58,7 +62,9 @@
  * @author Andre Dietisheim
  *
  */
-public class NewApplicationWizardModel extends ResourceLabelsPageModel implements IApplicationSourceListPageModel {
+public class NewApplicationWizardModel 
+		extends ResourceLabelsPageModel 
+		implements IApplicationSourceListPageModel {
 
 	private Connection connection;
 	private IProject project;
@@ -73,21 +79,25 @@ public class NewApplicationWizardModel extends ResourceLabelsPageModel implement
 	private IResourceFactory resourceFactory;
 	private org.eclipse.core.resources.IProject eclipseProject;
 	private Comparator<ObservableTreeItem> comparator;
-
-	private void update(boolean useLocalAppSource, IProject selectedProject, List<ObservableTreeItem> projectItems,
+	private String cloneDestination;
+	
+	public NewApplicationWizardModel() {
+	    this.cloneDestination = EGitUIUtils.getEGitDefaultRepositoryPath();
+	}
+	
+	private void update(boolean useLocalAppSource, IProject selectedProject, List<ObservableTreeItem> projectItems, 
 			IApplicationSource appSource, String localAppSourceFilename, IStatus appSourceStatus) {
 		updateProjectItems(projectItems);
-		firePropertyChange(PROPERTY_PROJECT, this.project,
+		firePropertyChange(PROPERTY_PROJECT, this.project, 
 				this.project = selectedProject = getProjectOrDefault(selectedProject, projectItems));
-		firePropertyChange(PROPERTY_APP_SOURCES, this.projectTemplates,
+		firePropertyChange(PROPERTY_APP_SOURCES, this.projectTemplates, 
 				this.projectTemplates = getProjectTemplates(selectedProject, projectItems));
 		updateAppSourceStatus(appSourceStatus);
-		firePropertyChange(PROPERTY_USE_LOCAL_APP_SOURCE, this.useLocalAppSource,
-				this.useLocalAppSource = useLocalAppSource);
+		firePropertyChange(PROPERTY_USE_LOCAL_APP_SOURCE, this.useLocalAppSource, this.useLocalAppSource = useLocalAppSource);
 		updateSelectedAppSource(useLocalAppSource, appSource, localAppSource, localAppSourceFilename);
 	}
 
-	private void updateSelectedAppSource(boolean useLocalAppSource, IApplicationSource serverAppSource,
+	private void updateSelectedAppSource(boolean useLocalAppSource, IApplicationSource serverAppSource, 
 			IApplicationSource localAppSource, String localAppSourceFilename) {
 		IApplicationSource source;
 		if (useLocalAppSource) {
@@ -100,33 +110,32 @@ private void updateSelectedAppSource(boolean useLocalAppSource, IApplicationSour
 		IApplicationSource oldSelectedAppSource = this.selectedAppSource;
 		this.localAppSourceFilename = localAppSourceFilename;
 		this.selectedAppSource = source;
-		firePropertyChange(PROPERTY_LOCAL_APP_SOURCE_FILENAME, oldLocalAppSourceFileName, this.localAppSourceFilename);
+        firePropertyChange(PROPERTY_LOCAL_APP_SOURCE_FILENAME, oldLocalAppSourceFileName, this.localAppSourceFilename);
 		firePropertyChange(PROPERTY_SELECTED_APP_SOURCE, oldSelectedAppSource, this.selectedAppSource);
 	}
-
+	
 	private void updateLabels(IApplicationSource source) {
-		if (source != null && ResourceKind.TEMPLATE.equals(source.getKind())) {
+		if(source != null && ResourceKind.TEMPLATE.equals(source.getKind())) {
 			ITemplate template = (ITemplate) source.getSource();
 			setLabels(template.getObjectLabels());
 			return;
 		}
 		setLabels(Collections.emptyMap());
 	}
-
+	
 	private void updateAppSourceStatus(IStatus appSourceStatus) {
-		firePropertyChange(PROPERTY_APP_SOURCE_STATUS, this.appSourceStatus, this.appSourceStatus = appSourceStatus);
+	    firePropertyChange(PROPERTY_APP_SOURCE_STATUS, this.appSourceStatus, this.appSourceStatus = appSourceStatus);
 	}
-
+	
 	private void setLabels(Map<String, String> labelMap) {
-		if (labelMap == null)
-			return;
-		List<Label> labels = new ArrayList<>(labelMap.size());
-		for (Entry<String, String> entry : labelMap.entrySet()) {
+		if(labelMap == null) return;
+		List<Label> labels =  new ArrayList<>(labelMap.size());
+		for (Entry<String,String> entry : labelMap.entrySet()) {
 			labels.add(new Label(entry.getKey(), entry.getValue()));
 		}
 		setLabels(labels);
 	}
-
+	
 	private IApplicationSource getLocalAppSource(IProgressMonitor monitor, String filename) {
 		if (StringUtils.isBlank(filename)) {
 			return null;
@@ -138,27 +147,26 @@ private IApplicationSource getLocalAppSource(IProgressMonitor monitor, String fi
 				return null;
 			}
 			try (InputStream input = createInputStream(filename, monitor)) {
-				resource = resourceFactory.create(input);
-				if (resource != null && !(resource instanceof ITemplate)) {
-					throw new NotATemplateException(resource.getKind());
-				}
-			}
+                resource = resourceFactory.create(input);
+                if(resource != null && !(resource instanceof ITemplate)) {
+                	throw new NotATemplateException(resource.getKind());
+                }
+            }
 		} catch (FileNotFoundException e) {
 			throw new OpenShiftException(e, NLS.bind("Could not find the file \"{0}\" to upload", filename));
 		} catch (IOException e) {
-			throw new OpenShiftException(e, NLS.bind("Error reading the file or URL \"{0}\" to upload", filename));
+            throw new OpenShiftException(e, NLS.bind("Error reading the file or URL \"{0}\" to upload", filename));
 		} catch (ResourceFactoryException | ClassCastException e) {
 			throw e;
 		}
-		switch (resource.getKind()) {
+		switch(resource.getKind()) {
 		case ResourceKind.TEMPLATE:
-			return new TemplateApplicationSource((ITemplate) resource);
+			return new TemplateApplicationSource((ITemplate)resource);
 		}
 		throw new OpenShiftException("Creating applications from local files is only allowed using a template");
 	}
-
-	private List<ObservableTreeItem> getProjectTemplates(IProject selectedProject,
-			List<ObservableTreeItem> allProjects) {
+	
+	private List<ObservableTreeItem> getProjectTemplates(IProject selectedProject, List<ObservableTreeItem> allProjects) {
 		if (allProjects == null) {
 			return null;
 		}
@@ -181,7 +189,7 @@ private void updateProjectItems(List<ObservableTreeItem> projectItems) {
 		this.projectItems.addAll(newItems);
 		firePropertyChange(PROPERTY_PROJECT_ITEMS, oldItems, this.projectItems);
 	}
-
+	
 	@Override
 	public void setServerAppSource(IApplicationSource appSource) {
 		update(false, this.project, this.projectItems, appSource, localAppSourceFilename, Status.OK_STATUS);
@@ -191,15 +199,15 @@ public void setServerAppSource(IApplicationSource appSource) {
 	public IApplicationSource getServerAppSource() {
 		return serverAppSource;
 	}
+	
+    @Override
+    public void resetLocalAppSource() {
+        this.localAppSource = null;
+        firePropertyChange(PROPERTY_SELECTED_APP_SOURCE, this.selectedAppSource, this.selectedAppSource = null);
+        firePropertyChange(PROPERTY_APP_SOURCE_STATUS, this.appSourceStatus, this.appSourceStatus = Status.OK_STATUS);
+    }
 
-	@Override
-	public void resetLocalAppSource() {
-		this.localAppSource = null;
-		firePropertyChange(PROPERTY_SELECTED_APP_SOURCE, this.selectedAppSource, this.selectedAppSource = null);
-		firePropertyChange(PROPERTY_APP_SOURCE_STATUS, this.appSourceStatus, this.appSourceStatus = Status.OK_STATUS);
-	}
-
-	@Override
+    @Override
 	public IApplicationSource getSelectedAppSource() {
 		return selectedAppSource;
 	}
@@ -212,9 +220,10 @@ private IProject getProjectOrDefault(IProject project, List<ObservableTreeItem>
 	}
 
 	private IProject getDefaultProject(List<ObservableTreeItem> projects) {
-		if (projects == null || projects.size() == 0) {
+		if (projects == null 
+				|| projects.size() == 0) {
 			return null;
-		} else if (projects.size() == 1) {
+		} else if(projects.size() == 1) {
 			return (IProject) projects.get(0).getModel();
 		}
 		ObservableTreeItem[] items = projects.toArray(new ObservableTreeItem[projects.size()]);
@@ -226,8 +235,7 @@ private IProject getDefaultProject(List<ObservableTreeItem> projects) {
 
 	@Override
 	public void setProject(IProject project) {
-		update(this.useLocalAppSource, project, this.projectItems, this.serverAppSource, this.localAppSourceFilename,
-				this.appSourceStatus);
+		update(this.useLocalAppSource, project, this.projectItems, this.serverAppSource, this.localAppSourceFilename, this.appSourceStatus);
 	}
 
 	@Override
@@ -248,8 +256,7 @@ public void loadResources() {
 
 	@Override
 	public void setUseLocalAppSource(boolean useLocalTemplate) {
-		update(useLocalTemplate, this.project, this.projectItems, this.serverAppSource, this.localAppSourceFilename,
-				this.appSourceStatus);
+		update(useLocalTemplate, this.project, this.projectItems, this.serverAppSource, this.localAppSourceFilename, this.appSourceStatus);
 	}
 
 	@Override
@@ -258,17 +265,17 @@ public boolean isUseLocalAppSource() {
 	}
 
 	public InputStream createInputStream(String filename, IProgressMonitor monitor) throws IOException {
-		if (OpenshiftUIConstants.URL_VALIDATOR.isValid(filename)) {
-			try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-				IStatus status = OpenshiftUIConstants.TRANSPORT_UTILITY.download(filename, filename, out, monitor);
-				if (!status.isOK()) {
-					throw new IOException(status.getMessage());
-				}
-				return new ByteArrayInputStream(out.toByteArray());
-			}
-		} else {
-			return new FileInputStream(filename);
-		}
+	    if (OpenshiftUIConstants.URL_VALIDATOR.isValid(filename)) {
+	        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+	            IStatus status = OpenshiftUIConstants.TRANSPORT_UTILITY.download(filename, filename, out, monitor);
+	            if (!status.isOK()) {
+	                throw new IOException(status.getMessage());
+	            }
+	            return new ByteArrayInputStream(out.toByteArray());
+	        }
+	    } else {
+	        return new FileInputStream(filename);
+	    }
 	}
 
 	@Override
@@ -280,35 +287,34 @@ public void setLocalAppSourceFileName(String filename) {
 	public String getLocalAppSourceFileName() {
 		return this.localAppSourceFilename;
 	}
-
+	
 	/**
-	 * @return the appSourceStatus
-	 */
-	@Override
-	public IStatus getAppSourceStatus() {
-		return appSourceStatus;
-	}
-
-	@Override
-	public void loadAppSource(IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		try {
-			if (useLocalAppSource) {
-				IApplicationSource source = getLocalAppSource(monitor, localAppSourceFilename);
-				updateSelectedAppSource(useLocalAppSource, serverAppSource, source, localAppSourceFilename);
-			}
-		} catch (OpenShiftException e) {
-			status = StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
-					NLS.bind("Could not load template from {0}: {1}", localAppSourceFilename, e.getLocalizedMessage()),
-					e);
-		} catch (NotATemplateException e) {
-			status = StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID,
-					NLS.bind("{0} is not a template: {1}", localAppSourceFilename, e.getLocalizedMessage()));
-		}
-		updateAppSourceStatus(status);
-	}
-
+     * @return the appSourceStatus
+     */
 	@Override
+    public IStatus getAppSourceStatus() {
+        return appSourceStatus;
+    }
+	
+    @Override
+    public void loadAppSource(IProgressMonitor monitor) {
+        IStatus status = Status.OK_STATUS;
+        try {
+            if (useLocalAppSource) {
+                IApplicationSource source = getLocalAppSource(monitor, localAppSourceFilename);
+                updateSelectedAppSource(useLocalAppSource, serverAppSource, source, localAppSourceFilename);
+            }
+        } catch (OpenShiftException e) {
+            status = StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID, 
+            		NLS.bind("Could not load template from {0}: {1}", localAppSourceFilename, e.getLocalizedMessage()), e);
+        } catch (NotATemplateException e) {
+            status = StatusFactory.errorStatus(OpenShiftUIActivator.PLUGIN_ID, 
+            		NLS.bind("{0} is not a template: {1}", localAppSourceFilename, e.getLocalizedMessage()));
+        }
+        updateAppSourceStatus(status);
+    }
+
+    @Override
 	public Connection getConnection() {
 		return connection;
 	}
@@ -346,27 +352,32 @@ private void setResourceFactory(Connection connection) {
 	public void setResourceFactory(IResourceFactory factory) {
 		this.resourceFactory = factory;
 	}
-
+	
 	protected void setProjectItems(List<ObservableTreeItem> projects) {
-		update(useLocalAppSource, findProject(this.project, projects), projects, serverAppSource,
+		update(useLocalAppSource, findProject(this.project, projects), projects, serverAppSource, 
 				localAppSourceFilename, this.appSourceStatus);
 	}
 
 	private IProject findProject(final IProject project, List<ObservableTreeItem> projects) {
-		if (project == null || CollectionUtils.isEmpty(projects)) {
+		if(project == null 
+				|| CollectionUtils.isEmpty(projects)) {
 			return null;
 		}
 
-		return (IProject) projects.stream().filter(item -> {
-			if (item.getModel() instanceof IProject) {
-				IProject p = (IProject) item.getModel();
-				if (p != null) {
-					boolean equals = ObjectUtils.equals(project, p);
-					return equals;
+		return (IProject) projects.stream()
+			.filter(item -> {
+				if(item.getModel() instanceof IProject) {
+					IProject p = (IProject) item.getModel();
+					if (p != null) {
+						boolean equals =  ObjectUtils.equals(project, p);
+						return equals;
+					}
 				}
-			}
-			return false;
-		}).findFirst().map(item -> item.getModel()).orElse(null);
+				return false;
+			})
+			.findFirst()
+			.map(item -> item.getModel())
+			.orElse(null);
 	}
 
 	@Override
@@ -378,10 +389,11 @@ public List<ObservableTreeItem> getProjectItems() {
 	public List<ObservableTreeItem> getAppSources() {
 		return this.projectTemplates;
 	}
-
+	
 	@Override
 	public boolean hasProjects() {
-		return projectItems != null && !projectItems.isEmpty();
+		return projectItems != null 
+				&& !projectItems.isEmpty();
 	}
 
 	@Override
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ResourceDetailsLabelProvider.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ResourceDetailsLabelProvider.java
index e32d843ebb..dd322a1d34 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ResourceDetailsLabelProvider.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/ResourceDetailsLabelProvider.java
@@ -10,16 +10,14 @@
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.openshift.internal.ui.utils.ResourceParametersUtils;
 import org.jboss.tools.openshift.internal.ui.wizard.newapp.ResourceDetailsContentProvider.ResourceProperty;
 
 import com.openshift.restclient.model.IResource;
@@ -32,7 +30,6 @@ public class ResourceDetailsLabelProvider extends StyledCellLabelProvider implem
 
 	private static final String LABEL_NOT_PROVIDED = "(Not Provided)";
 	private static final String LABEL_UNKNOWN = "(Unknown)";
-	private static final String LABEL_UNKNOWN_PARAMETER = "(Unknown parameter {0})";
 
 	private Map<String, IParameter> templateParameters;
 
@@ -58,7 +55,7 @@ public StyledString getStyledText(Object element) {
 		if (element instanceof IResource) {
 			IResource resource = (IResource) element;
 			StyledString text = new StyledString(StringUtils.capitalize(resource.getKind()));
-			text.append(" ").append(replaceParameters(resource.getName()), StyledString.QUALIFIER_STYLER);
+			text.append(" ").append(ResourceParametersUtils.replaceParametersInString(this.templateParameters, resource.getName()), StyledString.QUALIFIER_STYLER);
 			return text;
 		}
 		if (element instanceof ResourceProperty) {
@@ -81,29 +78,12 @@ public StyledString getStyledText(Object element) {
 					value = LABEL_NOT_PROVIDED;
 				}
 			}
-			text.append(replaceParameters(value), StyledString.QUALIFIER_STYLER);
+			text.append(ResourceParametersUtils.replaceParametersInString(this.templateParameters, value), StyledString.QUALIFIER_STYLER);
 			return text;
 		}
 		return null;
 	}
 
-	private String replaceParameters(String str) {
-		StringBuffer result = new StringBuffer();
-		Pattern p = Pattern.compile("\\$\\{[^}]+\\}");
-		Matcher m = p.matcher(str);
-		while (m.find()) {
-			String parameterVariable = m.group();
-			String parameterName = parameterVariable.substring(2, parameterVariable.length() - 1);
-			if (this.templateParameters.containsKey(parameterName)) {
-				m.appendReplacement(result, this.templateParameters.get(parameterName).getValue());
-			} else {
-				m.appendReplacement(result, NLS.bind(LABEL_UNKNOWN_PARAMETER, parameterName));
-			}
-		}
-		m.appendTail(result);
-		return result.toString();
-	}
-
 	@Override
 	public Image getImage(Object paramObject) {
 		return null;
diff --git a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/fromtemplate/ApplicationSourceFromTemplateModel.java b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/fromtemplate/ApplicationSourceFromTemplateModel.java
index d81597093c..d51d1f9c12 100644
--- a/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/fromtemplate/ApplicationSourceFromTemplateModel.java
+++ b/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/fromtemplate/ApplicationSourceFromTemplateModel.java
@@ -53,60 +53,69 @@
  * @author jeff.cantrill
  *
  */
-public class ApplicationSourceFromTemplateModel extends ResourceLabelsPageModel
-		implements IResourceDetailsModel, ITemplateParametersPageModel, IApplicationSourceModel {
+public class ApplicationSourceFromTemplateModel 
+	extends ResourceLabelsPageModel 
+	implements IResourceDetailsModel, ITemplateParametersPageModel, IApplicationSourceModel {
 
 	//intentionally package local, facilitates refresh of widgets in TemplateParametersPage
 	static final String PROPERTY_MODIFIED_PARAMETER = "modifiedParameter";
-
+	public static final String PROPERTY_BUILD_CONFIG_IMPORT_APP = "buildConfigName";
+	
 	private IProject project;
 	private ITemplate template;
 	private List<IParameter> parameters = new ArrayList<>();
 	private IParameter selectedParameter;
 	private Map<String, String> originalValueMap;
-	private Collection<IResource> items = new ArrayList<>();
+	private Collection<IResource> items = new ArrayList<>(); 
 	private org.eclipse.core.resources.IProject eclipseProject;
+	private String buildConfigName;
 
 	@Override
 	public IResourcesModelJob createFinishJob() {
 		return new AppFromTemplateJob();
 	}
-
-	class AppFromTemplateJob implements IResourcesModelJob {
-
+	
+	class AppFromTemplateJob implements IResourcesModelJob{
+		
 		private final CreateApplicationFromTemplateJob job;
-
-		AppFromTemplateJob() {
-			job = new CreateApplicationFromTemplateJob(project, template, getParameters(), getLabels());
+		
+		AppFromTemplateJob(){
+			job = new CreateApplicationFromTemplateJob(
+					project,
+					template,
+					buildConfigName,
+					getParameters(),
+					getLabels());
 		}
-
+		
 		@Override
 		public Collection<IResource> getResources() {
 			return job.getResources();
 		}
-
+		
 		@Override
 		public Runnable getSummaryRunnable(final Shell shell) {
 			return new Runnable() {
 				@Override
 				public void run() {
-					final String message = NLS.bind("Results of creating the resources from the {0} template.",
+					final String message = NLS.bind(
+							"Results of creating the resources from the {0} template.", 
 							template.getName());
 					new NewApplicationSummaryFromTemplateDialog(shell, job, message).open();
 				}
 			};
 		}
-
+		
 		@Override
 		public Job getJob() {
 			return job;
 		}
-
+		
 		@Override
 		public DelegatingProgressMonitor getDelegatingProgressMonitor() {
 			return job.getDelegatingProgressMonitor();
 		}
-
+		
 		@Override
 		public void addJobChangeListener(IJobChangeListener listener) {
 			job.addJobChangeListener(listener);
@@ -116,7 +125,7 @@ public void addJobChangeListener(IJobChangeListener listener) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void propertyChange(PropertyChangeEvent evt) {
-		switch (evt.getPropertyName()) {
+		switch(evt.getPropertyName()) {
 		case IResourceLabelsPageModel.PROPERTY_LABELS:
 			setLabels((List<Label>) evt.getNewValue());
 			break;
@@ -131,24 +140,23 @@ public void propertyChange(PropertyChangeEvent evt) {
 			break;
 		}
 	}
-
+	
 	private void handleSelectedAppSource(PropertyChangeEvent evt) {
-		if (evt.getNewValue() instanceof IApplicationSource
-				&& ResourceKind.TEMPLATE.equals(((IApplicationSource) evt.getNewValue()).getKind())) {
+		if(evt.getNewValue() instanceof IApplicationSource
+				&& ResourceKind.TEMPLATE.equals(((IApplicationSource) evt.getNewValue()).getKind())){
 			IApplicationSource source = (IApplicationSource) evt.getNewValue();
 			ITemplate newTemplate = (ITemplate) source.getSource();
 			if (!Objects.equals(newTemplate, this.template)) {
 				this.template = newTemplate;
 				updateTemplateParameters(newTemplate);
 			}
-		}
+		} 
 	}
-
 	private void handleEclipseProject(PropertyChangeEvent evt) {
-		if (evt.getNewValue() instanceof org.eclipse.core.resources.IProject) {
+		if(evt.getNewValue() instanceof org.eclipse.core.resources.IProject) {
 			this.eclipseProject = (org.eclipse.core.resources.IProject) evt.getNewValue();
 			updateTemplateParameters(template);
-		}
+		} 
 	}
 
 	@Override
@@ -176,7 +184,7 @@ public List<IParameter> getParameters() {
 
 	public boolean isParameterModified(IParameter param) {
 		return param != null && originalValueMap != null
-				&& !Objects.equals(param.getValue(), originalValueMap.get(param.getName()));
+			&& !Objects.equals(param.getValue(), originalValueMap.get(param.getName()));
 	}
 
 	@Override
@@ -201,22 +209,21 @@ public void setParameters(Collection<IParameter> parameters) {
 	private Map<String, String> toMap(Collection<IParameter> parameters) {
 		Map<String, String> paramsMap = new HashMap<>();
 		if (parameters != null) {
-			parameters.forEach(p -> paramsMap.put(p.getName(), p.getValue()));
+		  parameters.forEach(p -> paramsMap.put(p.getName(), p.getValue()));
 		}
 		return paramsMap;
 	}
 
-	private Collection<IParameter> injectProjectParameters(org.eclipse.core.resources.IProject project,
-			Collection<IParameter> originalParameters) {
+	private Collection<IParameter> injectProjectParameters(org.eclipse.core.resources.IProject project, Collection<IParameter> originalParameters) {
 		if (originalParameters == null || originalParameters.isEmpty()) {
 			return originalParameters;
 		}
 		Map<String, String> projectParams = getProjectParameters(project);
 
-		originalParameters = originalParameters.stream().map(p -> {
+		originalParameters = originalParameters.stream().map(p -> { 
 			String value = projectParams.get(p.getName());
 			if (value != null) {
-				p = p.clone();
+			    p = p.clone();
 				p.setValue(value);
 			}
 			return p;
@@ -226,20 +233,20 @@ private Collection<IParameter> injectProjectParameters(org.eclipse.core.resource
 	}
 
 	private Map<String, String> getProjectParameters(org.eclipse.core.resources.IProject project) {
-		if (project == null) {
+		if(project == null) {
 			return Collections.emptyMap();
 		}
 
-		Map<String, String> projectParams = new HashMap<>();
+		Map<String,String> projectParams = new HashMap<>();
 		String gitRepo = getGitRepo(project);
 		if (gitRepo != null) {
 			projectParams.put(PARAMETER_SOURCE_REPOSITORY_URL, gitRepo);
 			projectParams.put(PARAMETER_GIT_URI, gitRepo);//legacy key
-
+			
 			String branch = getGitBranch(project);
 			projectParams.put("SOURCE_REPOSITORY_REF", branch);
 			projectParams.put("GIT_REF", branch);//legacy key
-
+			
 			//Setting the context dir is a really bad idea if we're dealing with a multi module project
 			//Better let the user do it manually if needed.
 			//String contextDir = getDefaultContextDir(project);
@@ -254,8 +261,7 @@ private String getGitBranch(org.eclipse.core.resources.IProject project) {
 		try {
 			return StringUtils.defaultString(EGitUtils.getCurrentBranch(project));
 		} catch (CoreException e) {
-			throw new OpenShiftException(e,
-					NLS.bind("Could not determine the default Git branch for \"{0}\"", project.getName()));
+			throw new OpenShiftException(e, NLS.bind("Could not determine the default Git branch for \"{0}\"", project.getName()));
 		}
 	}
 
@@ -263,8 +269,7 @@ private String getGitRepo(org.eclipse.core.resources.IProject project) {
 		try {
 			return StringUtils.defaultString(EGitUtils.getDefaultRemoteRepo(project));
 		} catch (CoreException e) {
-			throw new OpenShiftException(e,
-					NLS.bind("Could not determine the default remote Git repository for \"{0}\"", project.getName()));
+			throw new OpenShiftException(e, NLS.bind("Could not determine the default remote Git repository for \"{0}\"", project.getName()));
 		}
 	}
 
@@ -274,7 +279,8 @@ public IParameter getSelectedParameter() {
 	}
 
 	private IParameter getSelectedParameterOrDefault() {
-		if (selectedParameter == null || !parameters.contains(selectedParameter)) {
+		if (selectedParameter == null
+				|| !parameters.contains(selectedParameter)) {
 			if (CollectionUtils.isEmpty(parameters)) {
 				return null;
 			} else {
@@ -309,14 +315,21 @@ public void resetParameter(IParameter param) {
 	}
 
 	private void setLabels(Map<String, String> labelMap) {
-		if (labelMap == null)
-			return;
-		List<Label> labels = new ArrayList<>(labelMap.size());
-		for (Entry<String, String> entry : labelMap.entrySet()) {
+		if(labelMap == null) return;
+		List<Label> labels =  new ArrayList<>(labelMap.size());
+		for (Entry<String,String> entry : labelMap.entrySet()) {
 			labels.add(new Label(entry.getKey(), entry.getValue()));
 		}
 		setLabels(labels);
 	}
+	
+	public void setBuildConfigName(String buildConfigName) {
+        firePropertyChange(PROPERTY_BUILD_CONFIG_IMPORT_APP, this.buildConfigName, this.buildConfigName = buildConfigName);
+    }
+    
+    public String getBuildConfigName() {
+        return this.buildConfigName;
+    }
 
 	@Override
 	public void dispose() {
@@ -325,7 +338,7 @@ public void dispose() {
 		template = null;
 		parameters.clear();
 		selectedParameter = null;
-		if (originalValueMap != null) {
+		if(originalValueMap != null) {
 			originalValueMap.clear();
 		}
 		items.clear();
diff --git a/tests/org.jboss.tools.openshift.test/src/org/jboss/tools/openshift/test/ui/job/CreateApplicationFromTemplateJobTest.java b/tests/org.jboss.tools.openshift.test/src/org/jboss/tools/openshift/test/ui/job/CreateApplicationFromTemplateJobTest.java
index f78eb4b6bb..6d5928ea0a 100644
--- a/tests/org.jboss.tools.openshift.test/src/org/jboss/tools/openshift/test/ui/job/CreateApplicationFromTemplateJobTest.java
+++ b/tests/org.jboss.tools.openshift.test/src/org/jboss/tools/openshift/test/ui/job/CreateApplicationFromTemplateJobTest.java
@@ -145,7 +145,7 @@ public static class CreateApplicationFromTemplateJobRunner extends CreateApplica
 
 		public CreateApplicationFromTemplateJobRunner(IProject project, ITemplate template,
 				Collection<IParameter> parameters, Collection<Label> labels) {
-			super(project, template, parameters, labels);
+			super(project, template, "", parameters, labels);
 		}
 
 		public IStatus runMe() {