diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue
index f47f6953e..31b25683b 100644
--- a/src/components/AccountCreateUpdateForm/index.vue
+++ b/src/components/AccountCreateUpdateForm/index.vue
@@ -58,7 +58,7 @@ export default {
             }
           }
         },
-        password: {
+        secret: {
           label: this.$t('assets.Password'),
           component: UpdateToken,
           hidden: (formValue) => formValue.secret_type !== 'password'
diff --git a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
index 6dc04dbf7..e19b5286a 100644
--- a/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
+++ b/src/views/accounts/AccountTemplate/AccountTemplateCreateUpdate.vue
@@ -4,6 +4,7 @@
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import { UpdateToken } from '@/components/FormFields'
 
 export default {
   name: 'GatewayCreateUpdate',
@@ -17,34 +18,50 @@ export default {
       hasDetailInMsg: false,
       fields: [
         [this.$t('common.Basic'), ['name', 'username', 'privileged']],
-        [this.$t('assets.Secret'), ['secret_type', 'secret']],
+        [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'access_key', 'passphrase']],
         [this.$t('common.Other'), ['comment']]
       ],
       fieldsMeta: {
         secret_type: {
-          on: {
-            change: this.secretTypeChange
-          }
         },
         secret: {
+          label: this.$t('assets.Password'),
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'password'
+        },
+        ssh_key: {
+          label: this.$t('assets.PrivateKey'),
           el: {
-            type: 'input',
+            type: 'textarea',
             rows: 4
-          }
+          },
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        passphrase: {
+          label: 'Passphrase',
+          component: UpdateToken,
+          hidden: (formValue) => formValue.secret_type !== 'ssh_key'
+        },
+        token: {
+          label: 'Token',
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'token'
+        },
+        access_key: {
+          label: 'access key',
+          el: {
+            type: 'textarea',
+            rows: 4
+          },
+          hidden: (formValue) => formValue.secret_type !== 'access_key'
         }
       },
       createSuccessNextRoute: { name: 'AccountTemplateList' },
       updateSuccessNextRoute: { name: 'AccountTemplateList' }
     }
-  },
-  methods: {
-    secretTypeChange([value]) {
-      if (value !== 'password') {
-        this.$set(this.fieldsMeta.secret.el, 'type', 'textarea')
-      } else {
-        this.$set(this.fieldsMeta.secret.el, 'type', 'input')
-      }
-    }
   }
 }
 </script>
diff --git a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
index 604b8f4fb..17f1cb421 100644
--- a/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue
@@ -50,7 +50,13 @@ export default {
           [this.$t('assets.Label'), ['labels']],
           [this.$t('common.Other'), ['is_active', 'comment']]
         ],
-        fieldsMeta: assetFieldsMeta(this)
+        fieldsMeta: assetFieldsMeta(this),
+        cleanFormValue(values) {
+          const { id = '' } = this.$route.params
+          if (id) delete values['accounts']
+
+          return values
+        }
       }
     }
   },