diff --git a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
index 108abcd5cd44..b2b46606d57e 100644
--- a/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
+++ b/app/assets/javascripts/controllers/ems_common/ems_common_form_controller.js
@@ -490,8 +490,6 @@ ManageIQ.angular.app.controller('emsCommonFormController', ['$http', '$scope', '
       $scope.emsCommonModel.metrics_api_port = "5432";
       $scope.emsCommonModel.default_api_port = $scope.getDefaultApiPort($scope.emsCommonModel.emstype);
       $scope.emsCommonModel.metrics_database_name = "ovirt_engine_history";
-    } else if ($scope.emsCommonModel.emstype === 'kubevirt') {
-      $scope.emsCommonModel.default_api_port = "8443";
     } else if ($scope.emsCommonModel.emstype === 'vmware_cloud') {
       $scope.emsCommonModel.default_api_port = "443";
       $scope.emsCommonModel.event_stream_selection = "none";
diff --git a/app/controllers/ems_infra_controller.rb b/app/controllers/ems_infra_controller.rb
index 181174b959bf..3c10d1343ff6 100644
--- a/app/controllers/ems_infra_controller.rb
+++ b/app/controllers/ems_infra_controller.rb
@@ -35,6 +35,11 @@ def index
     redirect_to :action => 'show_list'
   end
 
+  def new
+    @disabled_ems_infra_types = ['Kubevirt', 'kubevirt']
+    super
+  end
+
   def scaling
     assert_privileges("ems_infra_scale")
 
diff --git a/app/controllers/mixins/ems_common_angular.rb b/app/controllers/mixins/ems_common_angular.rb
index 5bc05b731ba7..ab4918692db0 100644
--- a/app/controllers/mixins/ems_common_angular.rb
+++ b/app/controllers/mixins/ems_common_angular.rb
@@ -462,7 +462,6 @@ def ems_form_fields
                          :kubevirt_auth_status                => kubevirt_auth_status,
                          :kubevirt_password                   => kubevirt_password,
                          :kubevirt_password_exists            => @ems.authentication_token(:kubevirt).nil? ? false : true,
-                         :provider_options                    => provider_options,
                          :virtualization_selection            => retrieve_virtualization_selection}
       end
 
@@ -575,9 +574,9 @@ def set_ems_record_vars(ems, mode = nil)
 
       if ems.kind_of?(ManageIQ::Providers::Kubevirt::InfraManager)
         kubevirt_endpoint = {
-          :role                  => :kubevirt,
-          :hostname              => kubevirt_hostname,
-          :port                  => kubevirt_api_port,
+          :role     => :kubevirt,
+          :hostname => kubevirt_hostname,
+          :port     => kubevirt_api_port,
         }
 
         kubevirt_endpoint.merge!(endpoint_security_options(kubevirt_security_protocol, kubevirt_tls_ca_certs))
diff --git a/app/views/ems_infra/_form.html.haml b/app/views/ems_infra/_form.html.haml
index d0e0e80da3de..ec9b92ddbd58 100644
--- a/app/views/ems_infra/_form.html.haml
+++ b/app/views/ems_infra/_form.html.haml
@@ -24,7 +24,7 @@
         = _('Type')
       .col-md-8
         = select_tag('emstype',
-                     options_for_select([["<#{_('Choose')}>", nil]] + @ems_types, disabled: ["<#{_('Choose')}>", nil]),
+                     options_for_select([["<#{_('Choose')}>", nil]] + @ems_types, disabled: ["<#{_('Choose')}>", nil].concat(@disabled_ems_infra_types || [])),
                      "ng-if"                       => "newRecord",
                      "ng-model"                    => "emsCommonModel.emstype",
                      "ng-change"                   => "providerTypeChanged()",