diff --git a/ui/src/config/section/storage.js b/ui/src/config/section/storage.js
index 9100104e7f4..9f73f8c5f3f 100644
--- a/ui/src/config/section/storage.js
+++ b/ui/src/config/section/storage.js
@@ -98,12 +98,8 @@ export default {
           docHelp: 'adminguide/storage.html#uploading-an-existing-volume-to-a-virtual-machine',
           label: 'label.upload.volume.from.url',
           listView: true,
-          args: ['url', 'name', 'zoneid', 'format', 'diskofferingid', 'checksum'],
-          mapping: {
-            format: {
-              options: ['RAW', 'VHD', 'VHDX', 'OVA', 'QCOW2']
-            }
-          }
+          popup: true,
+          component: () => import('@/views/storage/UploadVolume.vue')
         },
         {
           api: 'attachVolume',
diff --git a/ui/src/views/storage/UploadLocalVolume.vue b/ui/src/views/storage/UploadLocalVolume.vue
index 0e5df836fcc..dc13a6070ef 100644
--- a/ui/src/views/storage/UploadLocalVolume.vue
+++ b/ui/src/views/storage/UploadLocalVolume.vue
@@ -125,6 +125,39 @@
             :placeholder="$t('label.volumechecksum.description')"
           />
         </a-form-item>
+        <a-form-item v-if="'listDomains' in $store.getters.apis">
+          <tooltip-label slot="label" :title="$t('label.domain')" :tooltip="apiParams.domainid.description"/>
+          <a-select
+            v-decorator="['domainid', {}]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :loading="domainLoading"
+            :placeholder="this.$t('label.domainid')"
+            @change="val => { this.handleDomainChange(this.domainList[val].id) }">
+            <a-select-option v-for="(opt, optIndex) in this.domainList" :key="optIndex">
+              {{ opt.path || opt.name || opt.description }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item v-if="'listDomains' in $store.getters.apis">
+          <tooltip-label slot="label" :title="$t('label.account')" :tooltip="apiParams.account.description"/>
+          <a-select
+            v-decorator="['account', {}]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :placeholder="'Account'"
+            @change="val => { this.handleAccountChange(val) }">
+            <a-select-option v-for="(acc, index) in accountList" :value="acc.name" :key="index">
+              {{ acc.name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
         <div :span="24" class="action-button">
           <a-button @click="closeAction">{{ this.$t('label.cancel') }}</a-button>
           <a-button :loading="loading" type="primary" ref="submit" @click="handleSubmit">{{ this.$t('label.ok') }}</a-button>
@@ -150,11 +183,16 @@ export default {
     return {
       fileList: [],
       zones: [],
+      domainList: [],
+      accountList: [],
       offerings: [],
       offeringLoading: false,
       formats: ['RAW', 'VHD', 'VHDX', 'OVA', 'QCOW2'],
       zoneSelected: '',
+      domainId: null,
+      account: null,
       uploadParams: null,
+      domainLoading: false,
       loading: false,
       uploadPercentage: 0
     }
@@ -164,7 +202,7 @@ export default {
     this.apiParams = this.$getApiParams('getUploadParamsForVolume')
   },
   created () {
-    this.listZones()
+    this.fetchData()
   },
   methods: {
     listZones () {
@@ -210,6 +248,54 @@ export default {
       this.fileList = [...this.fileList, file]
       return false
     },
+    handleDomainChange (domain) {
+      this.domainId = domain
+      if ('listAccounts' in this.$store.getters.apis) {
+        this.fetchAccounts()
+      }
+    },
+    handleAccountChange (acc) {
+      if (acc) {
+        this.account = acc.name
+      } else {
+        this.account = acc
+      }
+    },
+    fetchData () {
+      this.listZones()
+      if ('listDomains' in this.$store.getters.apis) {
+        this.fetchDomains()
+      }
+    },
+    fetchDomains () {
+      this.domainLoading = true
+      api('listDomains', {
+        listAll: true,
+        details: 'min'
+      }).then(response => {
+        this.domainList = response.listdomainsresponse.domain
+
+        if (this.domainList[0]) {
+          this.handleDomainChange(null)
+        }
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.domainLoading = false
+      })
+    },
+    fetchAccounts () {
+      api('listAccounts', {
+        domainid: this.domainId
+      }).then(response => {
+        this.accountList = response.listaccountsresponse.account || []
+        if (this.accountList && this.accountList.length === 0) {
+          this.handleAccountChange(null)
+        }
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
     handleSubmit (e) {
       e.preventDefault()
       if (this.loading) return
@@ -228,6 +314,7 @@ export default {
           }
           params[key] = input
         }
+        params.domainId = this.domainId
         this.loading = true
         api('getUploadParamsForVolume', params).then(json => {
           this.uploadParams = json.postuploadvolumeresponse?.getuploadparams || ''
diff --git a/ui/src/views/storage/UploadVolume.vue b/ui/src/views/storage/UploadVolume.vue
new file mode 100644
index 00000000000..79fbe0d2726
--- /dev/null
+++ b/ui/src/views/storage/UploadVolume.vue
@@ -0,0 +1,318 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+<template>
+  <div class="form-layout" v-ctrl-enter="handleSubmit">
+    <span v-if="uploadPercentage > 0">
+      <a-icon type="loading" />
+      {{ $t('message.upload.file.processing') }}
+      <a-progress :percent="uploadPercentage" />
+    </span>
+    <a-spin :spinning="loading" v-else>
+      <a-form
+        :form="form"
+        @submit="handleSubmit"
+        layout="vertical">
+        <a-form-item :label="$t('label.url')">
+          <a-input
+            v-decorator="['url', {
+              rules: [{ required: true, message: `${this.$t('message.error.required.input')}` }]
+            }]"
+            :placeholder="apiParams.url.description"/>
+        </a-form-item>
+        <a-form-item>
+          <tooltip-label slot="label" :title="$t('label.name')" :tooltip="apiParams.name.description"/>
+          <a-input
+            v-decorator="['name', {
+              rules: [{ required: true, message: $t('message.error.volume.name') }]
+            }]"
+            :placeholder="$t('label.volumename')"
+            autoFocus />
+        </a-form-item>
+        <a-form-item>
+          <tooltip-label slot="label" :title="$t('label.zoneid')" :tooltip="apiParams.zoneid.description"/>
+          <a-select
+            v-decorator="['zoneId', {
+              initialValue: zoneSelected,
+              rules: [
+                {
+                  required: true,
+                  message: `${this.$t('message.error.select')}`
+                }
+              ]
+            }]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.propsData.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }" >
+            <a-select-option :value="zone.id" v-for="zone in zones" :key="zone.id" :label="zone.name || zone.description">
+              <span>
+                <resource-icon v-if="zone.icon" :image="zone.icon.base64image" size="1x" style="margin-right: 5px"/>
+                <a-icon v-else type="global" style="margin-right: 5px"/>
+                {{ zone.name || zone.description }}
+              </span>
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item>
+          <tooltip-label slot="label" :title="$t('label.format')" :tooltip="apiParams.format.description"/>
+          <a-select
+            v-decorator="['format', {
+              initialValue: formats[0],
+              rules: [
+                {
+                  required: true,
+                  message: `${this.$t('message.error.select')}`
+                }
+              ]
+            }]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }" >
+            <a-select-option v-for="format in formats" :key="format">
+              {{ format }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item>
+          <tooltip-label slot="label" :title="$t('label.diskofferingid')" :tooltip="apiParams.diskofferingid.description || 'Disk Offering'"/>
+          <a-select
+            v-decorator="['diskofferingid', {
+              initialValue: selectedDiskOfferingId,
+              rules: [{ required: false, message: $t('message.error.select') }]}]"
+            :loading="loading"
+            @change="id => onChangeDiskOffering(id)"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }" >
+            <a-select-option
+              v-for="(offering, index) in offerings"
+              :value="offering.id"
+              :key="index">
+              {{ offering.displaytext || offering.name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item>
+          <tooltip-label slot="label" :title="$t('label.volumechecksum')" :tooltip="apiParams.checksum.description"/>
+          <a-input
+            v-decorator="['checksum']"
+            :placeholder="$t('label.volumechecksum.description')"
+          />
+        </a-form-item>
+        <a-form-item v-if="'listDomains' in $store.getters.apis">
+          <tooltip-label slot="label" :title="$t('label.domain')" :tooltip="apiParams.domainid.description"/>
+          <a-select
+            v-decorator="['domainid', {}]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :loading="domainLoading"
+            :placeholder="this.$t('label.domainid')"
+            @change="val => { this.handleDomainChange(this.domainList[val].id) }">
+            <a-select-option v-for="(opt, optIndex) in this.domainList" :key="optIndex">
+              {{ opt.path || opt.name || opt.description }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item v-if="'listDomains' in $store.getters.apis">
+          <tooltip-label slot="label" :title="$t('label.account')" :tooltip="apiParams.account.description"/>
+          <a-select
+            v-decorator="['account', {}]"
+            showSearch
+            optionFilterProp="children"
+            :filterOption="(input, option) => {
+              return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            }"
+            :placeholder="'Account'"
+            @change="val => { this.handleAccountChange(val) }">
+            <a-select-option v-for="(acc, index) in accountList" :value="acc.name" :key="index">
+              {{ acc.name }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+        <div :span="24" class="action-button">
+          <a-button @click="closeAction">{{ this.$t('label.cancel') }}</a-button>
+          <a-button :loading="loading" type="primary" ref="submit" @click="handleSubmit">{{ this.$t('label.ok') }}</a-button>
+        </div>
+      </a-form>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { api } from '@/api'
+import ResourceIcon from '@/components/view/ResourceIcon'
+import TooltipLabel from '@/components/widgets/TooltipLabel'
+
+export default {
+  name: 'UploadVolume',
+  components: {
+    ResourceIcon,
+    TooltipLabel
+  },
+  data () {
+    return {
+      zones: [],
+      domainList: [],
+      accountList: [],
+      formats: ['RAW', 'VHD', 'VHDX', 'OVA', 'QCOW2'],
+      offerings: [],
+      zoneSelected: '',
+      selectedDiskOfferingId: null,
+      domainId: null,
+      account: null,
+      uploadParams: null,
+      domainLoading: false,
+      loading: false,
+      uploadPercentage: 0
+    }
+  },
+  beforeCreate () {
+    this.form = this.$form.createForm(this)
+    this.apiParams = this.$getApiParams('uploadVolume')
+  },
+  created () {
+    this.fetchData()
+  },
+  methods: {
+    fetchData () {
+      this.loading = true
+      api('listZones', { showicon: true }).then(json => {
+        this.zones = json.listzonesresponse.zone || []
+        this.selectedZoneId = this.zones[0].id || ''
+        this.fetchDiskOfferings(this.selectedZoneId)
+      }).finally(() => {
+        this.loading = false
+      })
+      if ('listDomains' in this.$store.getters.apis) {
+        this.fetchDomains()
+      }
+    },
+    fetchDiskOfferings (zoneId) {
+      this.loading = true
+      api('listDiskOfferings', {
+        zoneid: zoneId,
+        listall: true
+      }).then(json => {
+        this.offerings = json.listdiskofferingsresponse.diskoffering || []
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    fetchDomains () {
+      this.domainLoading = true
+      api('listDomains', {
+        listAll: true,
+        details: 'min'
+      }).then(response => {
+        this.domainList = response.listdomainsresponse.domain
+
+        if (this.domainList[0]) {
+          this.handleDomainChange(null)
+        }
+      }).catch(error => {
+        this.$notifyError(error)
+      }).finally(() => {
+        this.domainLoading = false
+      })
+    },
+    fetchAccounts () {
+      api('listAccounts', {
+        domainid: this.domainId
+      }).then(response => {
+        this.accountList = response.listaccountsresponse.account || []
+        if (this.accountList && this.accountList.length === 0) {
+          this.handleAccountChange(null)
+        }
+      }).catch(error => {
+        this.$notifyError(error)
+      })
+    },
+    onChangeDiskOffering (id) {
+      const offering = this.offerings.filter(x => x.id === id)
+      this.customDiskOffering = offering[0]?.iscustomized || false
+      this.isCustomizedDiskIOps = offering[0]?.iscustomizediops || false
+    },
+    handleDomainChange (domain) {
+      this.domainId = domain
+      if ('listAccounts' in this.$store.getters.apis) {
+        this.fetchAccounts()
+      }
+    },
+    handleAccountChange (acc) {
+      if (acc) {
+        this.account = acc.name
+      } else {
+        this.account = acc
+      }
+    },
+    handleSubmit (e) {
+      e.preventDefault()
+      if (this.loading) return
+      this.form.validateFieldsAndScroll((err, values) => {
+        if (err) {
+          return
+        }
+        const params = {
+        }
+        for (const key in values) {
+          const input = values[key]
+          if (input === undefined) {
+            continue
+          }
+          params[key] = input
+        }
+        params.domainId = this.domainId
+        this.loading = true
+        api('uploadVolume', params).then(json => {
+          this.$notification.success({
+            message: this.$t('message.success.upload'),
+            description: this.$t('message.success.upload.volume.description')
+          })
+          this.closeAction()
+          this.$emit('refresh-data')
+        }).catch(error => {
+          this.$notifyError(error)
+        }).finally(() => {
+          this.loading = false
+        })
+      })
+    },
+    closeAction () {
+      this.$emit('close-action')
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.form-layout {
+  width: 80vw;
+
+  @media (min-width: 700px) {
+    width: 550px;
+  }
+}
+</style>