diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 05105fbac..87beceb23 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -118,3 +118,13 @@ callback_url:
 filter:
   label: Filter
   help: A boolean expression defining a filter run against the provided information.
+tenant_id: 
+  label: Tenant ID
+subscription_id:
+  label: Subscription ID
+access_key_id:
+  label: Access Key ID
+secret_access_key:
+  label: Secret Access Key
+region: 
+  label: Region
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index d00fa198b..f9f02515f 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -81,16 +82,18 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -106,10 +109,11 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -119,27 +123,11 @@
   <form.input
     @name='Region'
     @type='region'
-    @value='region'
-    @label='AWS Region'
+    @value={{@model.region}}
+    @label={{t 'form.region.label'}}
     readonly={{false}}
   />
 
-  {{!-- <form.input
-    @name='accesskey'
-    @type='accesskey'
-    @value='accesskey'
-    @label='Access key ID'
-    readonly={{false}}
-  />
-
-  <form.input
-    @name='secretaccesskey'
-    @type='secretaccesskey'
-    @value='secretaccesskey'
-    @label='Secret Access Key'
-    readonly={{false}}
-  /> --}}
-
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 3bfc74531..b4a9d4713 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -81,16 +82,18 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='AWS'
+            @label={{t 'resources.host-catalog.form.types.aws'}}
             @value='aws'
             @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -106,10 +109,11 @@
           as |radioGroup|
         >
           <radioGroup.card
-            @label='Azure'
+            @label={{t 'resources.host-catalog.form.types.azure'}}
             @value='azure'
             @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
+            @icon='flight-icons/svg/azure-color-16'
           />
         </form.radioGroup>
       </:body>
@@ -119,27 +123,11 @@
   <form.input
     @name='tenant_id'
     @type='tenant_id'
-    @value='tenant_id'
-    @label='Tenant ID'
+    @value={{@model.tenant_id}}
+    @label={{t 'form.tenant_id.label'}}
     readonly={{false}}
   />
 
-  {{!-- <form.input
-    @name='accesskey'
-    @type='accesskey'
-    @value='accesskey'
-    @label='Access key ID'
-    readonly={{false}}
-  />
-
-  <form.input
-    @name='secretaccesskey'
-    @type='secretaccesskey'
-    @value='secretaccesskey'
-    @label='Secret Access Key'
-    readonly={{false}}
-  /> --}}
-
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
@@ -148,4 +136,5 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
+
 </Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index def897e50..90cebebc9 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -4,35 +4,4 @@
   submit=@submit
   cancel=@cancel
   changeType=@changeType
-}}
-
-{{!-- {{#if @model.isStatic}}
-  {{component
-    (concat 'form/host-catalog/' @model.type)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-    form=form
-    toggleType=this.toggleType
-    showDynamicPlugins=this.showDynamicPlugins
-  }}
-{{else if @model.isPlugin}}
-  Model is plugin
-  {{#if @model.isAWS}}
-    Model is Aws
-  {{else if @model.isAzure}}
-    Model is Azure
-  {{/if}}
-{{/if}} --}}
-
-{{!-- {{#if @model.type}}
-  {{component
-    (concat 'form/auth-method/' @model.type)
-    model=@model
-    submit=@submit
-    cancel=@cancel
-    removeItemByIndex=@removeItemByIndex
-    addStringItem=@addStringItem
-    addAccountClaimMapItem=@addAccountClaimMapItem
-  }}
-{{/if}} --}}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index 50adcf87f..caac65a1d 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -13,6 +13,7 @@
     @label={{t 'form.name.label'}}
     @helperText={{t 'form.name.help'}}
     @error={{@model.errors.name}}
+    disabled={{@model.isSaving}}
     readonly={{false}}
     as |field|
   >
@@ -82,13 +83,13 @@
             as |radioGroup|
           >
             <radioGroup.card
-              @label='AWS'
+              @label={{t 'resources.host-catalog.form.types.aws'}}
               @value='aws'
               @helperText={{t 'resources.host-catalog.form.types.static.help'}}
               @layout='tile'
             />
             <radioGroup.card
-              @label='Azure'
+              @label={{t 'resources.host-catalog.form.types.azure'}}
               @value='azure'
               @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
               @layout='tile'