diff --git a/pkg/helpers/kubeconfig/smart_merge.go b/pkg/helpers/kubeconfig/smart_merge.go
index d096e1de33..d048714fc6 100644
--- a/pkg/helpers/kubeconfig/smart_merge.go
+++ b/pkg/helpers/kubeconfig/smart_merge.go
@@ -58,6 +58,9 @@ func CreateConfig(namespace, userName string, clientCfg *restclient.Config) (*cl
 
 	credentials := clientcmdapi.NewAuthInfo()
 	credentials.Token = clientCfg.BearerToken
+	credentials.TokenFile = clientCfg.BearerTokenFile
+	credentials.AuthProvider = clientCfg.AuthProvider
+	credentials.Exec = clientCfg.ExecProvider
 	credentials.ClientCertificate = clientCfg.TLSClientConfig.CertFile
 	if len(credentials.ClientCertificate) == 0 {
 		credentials.ClientCertificateData = clientCfg.TLSClientConfig.CertData
diff --git a/pkg/helpers/newapp/newapptest/newapp_test.go b/pkg/helpers/newapp/newapptest/newapp_test.go
index b7b60478f4..58ee50cb9d 100644
--- a/pkg/helpers/newapp/newapptest/newapp_test.go
+++ b/pkg/helpers/newapp/newapptest/newapp_test.go
@@ -517,7 +517,7 @@ func TestNewAppRunAll(t *testing.T) {
 			},
 			checkPort: "8080",
 			expected: map[string][]string{
-				"imageStream": {"ruby-hello-world", "ruby-27-centos7"},
+				"imageStream": {"ruby-hello-world", "ruby-27"},
 				"buildConfig": {"ruby-hello-world"},
 				"deployment":  {"ruby-hello-world"},
 				"service":     {"ruby-hello-world"},
@@ -743,7 +743,7 @@ func TestNewAppRunAll(t *testing.T) {
 				OriginNamespace: "default",
 			},
 			expected: map[string][]string{
-				"imageStream": {"ruby-hello-world", "ruby-27-centos7"},
+				"imageStream": {"ruby-hello-world", "ruby-27"},
 				"buildConfig": {"ruby-hello-world"},
 				"deployment":  {"ruby-hello-world"},
 				"service":     {"ruby-hello-world"},
@@ -761,7 +761,7 @@ func TestNewAppRunAll(t *testing.T) {
 				Resolvers: cmd.Resolvers{
 					DockerSearcher: app.DockerClientSearcher{
 						Client: &apptest.FakeDockerClient{
-							Images: []docker.APIImages{{RepoTags: []string{"quay.io/centos7/ruby-27-centos7"}}},
+							Images: []docker.APIImages{{RepoTags: []string{"registry.access.redhat.com/ubi8/ruby-27"}}},
 							Image:  dockerBuilderImage(),
 						},
 						Insecure: true,
@@ -1269,7 +1269,7 @@ func TestNewAppRunBuilds(t *testing.T) {
 			},
 			expected: map[string][]string{
 				"buildConfig": {"ruby-hello-world"},
-				"imageStream": {"mongodb-34-centos7", "ruby-27-centos7", "ruby-hello-world"},
+				"imageStream": {"mongodb-34-centos7", "ruby-27", "ruby-hello-world"},
 			},
 			checkResult: func(res *cmd.AppResult) error {
 				var bc *buildv1.BuildConfig