diff --git a/extensions/apps/extensions/src/components/pages/extension-edit-published-page/edit-published-extension-page.tsx b/extensions/apps/extensions/src/components/pages/extension-edit-published-page/edit-published-extension-page.tsx
index 78633243a4..d62d899dd7 100644
--- a/extensions/apps/extensions/src/components/pages/extension-edit-published-page/edit-published-extension-page.tsx
+++ b/extensions/apps/extensions/src/components/pages/extension-edit-published-page/edit-published-extension-page.tsx
@@ -19,6 +19,18 @@ import { selectAppData } from '@akashaorg/ui-awf-hooks/lib/selectors/get-apps-by
 import { MAX_GALLERY_IMAGES } from '../../../constants';
 import { AtomContext, formDefaultData } from './main-page';
 import { useAtom } from 'jotai';
+import { AppImageSource } from '@akashaorg/typings/lib/sdk/graphql-types-new';
+
+// remove all other props except for src, width and height from an image object
+const getImageObject = (imageWithExtraProps: AppImageSource) => {
+  if (imageWithExtraProps) {
+    return {
+      src: imageWithExtraProps.src,
+      width: imageWithExtraProps.width,
+      height: imageWithExtraProps.height,
+    };
+  } else return null;
+};
 
 type EditPublishedExtensionPageProps = {
   extensionId: string;
@@ -72,6 +84,7 @@ export const EditPublishedExtensionPage: React.FC<EditPublishedExtensionPageProp
       return {
         ...prev,
         ...formData,
+        dataSavedToForm: true,
       };
     });
   };
@@ -90,8 +103,8 @@ export const EditPublishedExtensionPage: React.FC<EditPublishedExtensionPageProp
 
   const formDefault = useMemo(() => {
     return {
-      logoImage: defaultValues?.logoImage,
-      coverImage: defaultValues?.coverImage,
+      logoImage: getImageObject(defaultValues?.logoImage),
+      coverImage: getImageObject(defaultValues?.coverImage),
       description: defaultValues?.description,
       gallery: defaultValues?.gallery,
       links: defaultValues?.links,
@@ -122,7 +135,13 @@ export const EditPublishedExtensionPage: React.FC<EditPublishedExtensionPageProp
       logoImage: logoImage || formDefault?.logoImage,
       coverImage: coverImage || formDefault?.coverImage,
       description: formData?.description,
-      gallery: formData?.gallery,
+      gallery: galleryImages?.map(galleryImage => {
+        return {
+          width: galleryImage.size?.width,
+          height: galleryImage.size?.height,
+          src: galleryImage.src,
+        };
+      }),
       links: formData?.links,
     };
     updateAppMutation({
diff --git a/libs/design-system-components/src/components/ExtensionReleasePublishForm/index.tsx b/libs/design-system-components/src/components/ExtensionReleasePublishForm/index.tsx
index 3c9478ef16..788450fee6 100644
--- a/libs/design-system-components/src/components/ExtensionReleasePublishForm/index.tsx
+++ b/libs/design-system-components/src/components/ExtensionReleasePublishForm/index.tsx
@@ -110,7 +110,7 @@ const ExtensionReleasePublish: React.FC<ExtensionReleasePublishProps> = props =>
 
   return (
     <>
-      <form onSubmit={onSave} className={tw(apply`h-full`)}>
+      <form className={tw(apply`h-full`)}>
         <Stack direction="column" spacing="gap-y-4">
           <Stack padding="px-4 pb-16" spacing="gap-y-4">
             <Controller
@@ -192,7 +192,6 @@ const ExtensionReleasePublish: React.FC<ExtensionReleasePublishProps> = props =>
               label={nextButton.label}
               disabled={!isValid || !isFormDirty}
               onClick={showModalFlow ? onConfirmationModalOpen : onSave}
-              type="submit"
             />
           </Stack>
         </Stack>