diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 00b5148a6e4d..fc5dc6dcc9b9 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -737,7 +737,7 @@ protected Void managedCopyBaseImageCallback(AsyncCallbackDispatcher<VolumeServic
 
             volume.setPath(templateObjectTo.getPath());
 
-            if (templateObjectTo.getFormat() != null) {
+            if (templateObjectTo.getFormat() != null && volume.getFormat() == null) {
                 volume.setFormat(templateObjectTo.getFormat());
             }
 
diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
index d6b7b089d6bf..0c7d07e8fed1 100644
--- a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
+++ b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
@@ -160,7 +160,7 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet
 
                     volumeVO.setPoolType(storagePool.getPoolType());
                     volumeVO.setPoolId(storagePool.getId());
-                    volumeVO.setFormat(getImageFormatByHypervisor(storagePool.getHypervisor()));
+                    volumeVO.setFormat(getImageFormatByHypervisor(storagePool.getHypervisor(), details.get(OntapStorageConstants.PROTOCOL)));
                     logger.info("createAsync: Volume format set to [{}] for hypervisor [{}]", volumeVO.getFormat(), storagePool.getHypervisor());
 
                     if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(OntapStorageConstants.PROTOCOL))) {
@@ -988,9 +988,14 @@ private String buildSnapshotName(String cloudStackSnapshotName, long snapshotId)
     }
 
 
-    private Storage.ImageFormat getImageFormatByHypervisor(HypervisorType hypervisorType) {
+    private Storage.ImageFormat getImageFormatByHypervisor(HypervisorType hypervisorType, String protocol) {
         if (HypervisorType.KVM.equals(hypervisorType)) {
-            return Storage.ImageFormat.QCOW2;
+            if (ProtocolType.NFS3.name().equalsIgnoreCase(protocol)) {
+                return Storage.ImageFormat.QCOW2;
+            } else if (ProtocolType.ISCSI.name().equalsIgnoreCase(protocol)) {
+                return Storage.ImageFormat.RAW;
+            }
+            throw new CloudRuntimeException("Unsupported protocol [" + protocol + "] for ONTAP image format resolution");
         }
         throw new CloudRuntimeException("Unsupported hypervisor [" + hypervisorType + "] for ONTAP image format resolution");
     }