diff --git a/src/Components/CreateImageWizard/CreateImageWizard.js b/src/Components/CreateImageWizard/CreateImageWizard.js
index b79d5988..c8923903 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.js
+++ b/src/Components/CreateImageWizard/CreateImageWizard.js
@@ -77,7 +77,7 @@ const onSave = (values) => {
       image_requests: [
         {
           architecture: 'x86_64',
-          image_type: 'ami',
+          image_type: 'aws',
           upload_request: {
             type: 'aws',
             options: {
@@ -136,7 +136,7 @@ const onSave = (values) => {
       image_requests: [
         {
           architecture: 'x86_64',
-          image_type: 'vhd',
+          image_type: 'azure',
           upload_request: {
             type: 'azure',
             options: {
diff --git a/src/Components/ImagesTable/ImageBuildStatus.js b/src/Components/ImagesTable/ImageBuildStatus.js
index 420ed826..d956ed88 100644
--- a/src/Components/ImagesTable/ImageBuildStatus.js
+++ b/src/Components/ImagesTable/ImageBuildStatus.js
@@ -95,7 +95,10 @@ export const ImageBuildStatus = ({ imageId }) => {
   };
 
   let status;
-  if (image.imageType === 'aws') {
+  if (
+    !image.isClone &&
+    (image.imageType === 'aws' || image.imageType === 'ami')
+  ) {
     const imageStatuses = useSelector((state) =>
       selectImageStatusesById(state, image.id)
     );
diff --git a/src/Components/ImagesTable/ImageLink.js b/src/Components/ImagesTable/ImageLink.js
index b6cfd187..2e0d4275 100644
--- a/src/Components/ImagesTable/ImageLink.js
+++ b/src/Components/ImagesTable/ImageLink.js
@@ -68,7 +68,10 @@ const ImageLink = ({ imageId, isExpired, isInClonesTable }) => {
 
   if (!uploadStatus) return null;
 
-  if (hasProvisioning && image.imageType === 'ami') {
+  if (
+    hasProvisioning &&
+    (image.imageType === 'aws' || image.imageType === 'ami')
+  ) {
     return (
       <ProvisioningLink
         imageId={image.id}
diff --git a/src/store/clonesSlice.js b/src/store/clonesSlice.js
index 12a7a808..279ef185 100644
--- a/src/store/clonesSlice.js
+++ b/src/store/clonesSlice.js
@@ -41,7 +41,7 @@ export const selectCloneById = (state, cloneId) => {
       status: clone.image_status?.status,
       uploadStatus: clone.image_status?.upload_status,
       parent: clone.parent,
-      imageType: 'ami',
+      imageType: 'aws',
       isClone: true,
     };
   } else {
diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
index 5418020b..baaee9dc 100644
--- a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
+++ b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js
@@ -1617,7 +1617,7 @@ describe('Click through all steps', () => {
             image_requests: [
               {
                 architecture: 'x86_64',
-                image_type: 'ami',
+                image_type: 'aws',
                 upload_request: {
                   type: 'aws',
                   options: {
@@ -1701,7 +1701,7 @@ describe('Click through all steps', () => {
             image_requests: [
               {
                 architecture: 'x86_64',
-                image_type: 'vhd',
+                image_type: 'azure',
                 upload_request: {
                   type: 'azure',
                   options: {
diff --git a/src/test/Components/ImagesTable/ImagesTable.test.js b/src/test/Components/ImagesTable/ImagesTable.test.js
index ab3f1b53..e2aedc0a 100644
--- a/src/test/Components/ImagesTable/ImagesTable.test.js
+++ b/src/test/Components/ImagesTable/ImagesTable.test.js
@@ -31,7 +31,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {
@@ -51,7 +51,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'vhd',
+            image_type: 'gcp',
             upload_request: {
               type: 'gcp',
               options: {
@@ -70,7 +70,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {},
@@ -87,7 +87,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {},
@@ -104,7 +104,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {},
@@ -121,7 +121,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {},
@@ -138,7 +138,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {},
@@ -155,7 +155,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'vhd',
+            image_type: 'gcp',
             upload_request: {
               type: 'gcp',
               options: {
@@ -174,7 +174,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'vhd',
+            image_type: 'azure',
             upload_request: {
               type: 'azure',
               options: {},
diff --git a/src/test/Components/ShareImageModal/ShareImageModal.test.js b/src/test/Components/ShareImageModal/ShareImageModal.test.js
index 02de304c..0275a46c 100644
--- a/src/test/Components/ShareImageModal/ShareImageModal.test.js
+++ b/src/test/Components/ShareImageModal/ShareImageModal.test.js
@@ -22,7 +22,7 @@ const mockComposes = {
         image_requests: [
           {
             architecture: 'x86_64',
-            image_type: 'ami',
+            image_type: 'aws',
             upload_request: {
               type: 'aws',
               options: {
diff --git a/src/test/redux/reducers.test.js b/src/test/redux/reducers.test.js
index c3b3b815..695b94db 100644
--- a/src/test/redux/reducers.test.js
+++ b/src/test/redux/reducers.test.js
@@ -7,7 +7,7 @@ const compose = {
   image_requests: [
     {
       architecture: 'x86_64',
-      image_type: 'ami',
+      image_type: 'aws',
       upload_request: {
         type: 'aws',
         options: {},