diff --git a/libs/pages/application/src/lib/ui/page-settings-general/page-settings-general.tsx b/libs/pages/application/src/lib/ui/page-settings-general/page-settings-general.tsx
index 779f088b67a..faed95154c1 100644
--- a/libs/pages/application/src/lib/ui/page-settings-general/page-settings-general.tsx
+++ b/libs/pages/application/src/lib/ui/page-settings-general/page-settings-general.tsx
@@ -152,7 +152,7 @@ export function PageSettingsGeneral({
                         .exhaustive()}
                     />
                   ) : (
-                    <GeneralContainerSettings organization={organization} />
+                    <GeneralContainerSettings organization={organization} isSetting />
                   )}
                 </Section>
                 <Section className="gap-4">
@@ -191,7 +191,7 @@ export function PageSettingsGeneral({
               <>
                 <Section className="gap-4">
                   <Heading>Source</Heading>
-                  <GeneralContainerSettings organization={organization} />
+                  <GeneralContainerSettings organization={organization} isSetting />
                 </Section>
                 <Section className="gap-4">
                   <Heading>Deploy</Heading>
diff --git a/libs/shared/console-shared/src/lib/general-container-settings/ui/general-container-settings.tsx b/libs/shared/console-shared/src/lib/general-container-settings/ui/general-container-settings.tsx
index ff83827ac0a..fd7c1181b1a 100644
--- a/libs/shared/console-shared/src/lib/general-container-settings/ui/general-container-settings.tsx
+++ b/libs/shared/console-shared/src/lib/general-container-settings/ui/general-container-settings.tsx
@@ -2,12 +2,13 @@ import { type Organization } from 'qovery-typescript-axios'
 import { Controller, useFormContext } from 'react-hook-form'
 import { ContainerRegistryCreateEditModal, useContainerRegistries } from '@qovery/domains/organizations/feature'
 import { SETTINGS_CONTAINER_REGISTRIES_URL, SETTINGS_URL } from '@qovery/shared/routes'
-import { InputSelect, InputText, Link, useModal } from '@qovery/shared/ui'
+import { InputSelect, Link, useModal } from '@qovery/shared/ui'
 import ImageName from './image-name'
 import { ImageTag } from './image-tag'
 
 export interface GeneralContainerSettingsProps {
   organization?: Organization
+  isSetting?: boolean
 }
 
 export interface ContainerFormProps {
@@ -16,7 +17,7 @@ export interface ContainerFormProps {
   image_tag?: string
 }
 
-export function GeneralContainerSettings({ organization }: GeneralContainerSettingsProps) {
+export function GeneralContainerSettings({ organization, isSetting }: GeneralContainerSettingsProps) {
   const { control, watch } = useFormContext<ContainerFormProps>()
   const { openModal, closeModal } = useModal()
   const watchRegistry = watch('registry')
@@ -79,7 +80,12 @@ export function GeneralContainerSettings({ organization }: GeneralContainerSetti
         </p>
       </div>
       {organization && watchRegistry && (
-        <ImageName control={control} organizationId={organization.id} containerRegistryId={watchRegistry} />
+        <ImageName
+          control={control}
+          organizationId={organization.id}
+          containerRegistryId={watchRegistry}
+          isSetting={isSetting}
+        />
       )}
       {organization && watchRegistry && watchImageName && (
         <ImageTag
diff --git a/libs/shared/console-shared/src/lib/general-container-settings/ui/image-name.tsx b/libs/shared/console-shared/src/lib/general-container-settings/ui/image-name.tsx
index b99765cf2c6..ec619998e87 100644
--- a/libs/shared/console-shared/src/lib/general-container-settings/ui/image-name.tsx
+++ b/libs/shared/console-shared/src/lib/general-container-settings/ui/image-name.tsx
@@ -13,15 +13,26 @@ export function ImageName({
   control,
   organizationId,
   containerRegistryId,
+  isSetting,
 }: {
   control: Control<ContainerFormProps>
   organizationId: string
   containerRegistryId: string
+  isSetting?: boolean
 }) {
   const { setValue } = useFormContext()
   const { data: containerRegistries = [] } = useContainerRegistries({ organizationId })
   const watchImageName = useWatch({ control, name: 'image_name' }) || ''
-  const [customOptions, setCustomOptions] = useState<Value[]>([])
+  const [customOptions, setCustomOptions] = useState<Value[]>(
+    isSetting
+      ? [
+          {
+            value: watchImageName,
+            label: watchImageName,
+          },
+        ]
+      : []
+  )
   const [searchParams, setSearchParams] = useState(watchImageName)
   const debouncedImageName = useDebounce(searchParams, DEBOUNCE_TIME)
 
diff --git a/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx b/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx
index dab6c942e56..c9c73f165ca 100644
--- a/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx
+++ b/libs/shared/console-shared/src/lib/job-general-settings/ui/job-general-settings.tsx
@@ -82,12 +82,12 @@ export function JobGeneralSettings(props: JobGeneralSettingProps) {
             (props.isEdition ? (
               <div data-testid="container-fields">
                 <BlockContent title="Container Settings" classNameContent="space-y-4">
-                  <GeneralContainerSettings organization={props.organization} />
+                  <GeneralContainerSettings organization={props.organization} isSetting />
                 </BlockContent>
               </div>
             ) : (
               <div data-testid="container-fields" className="space-y-4">
-                <GeneralContainerSettings organization={props.organization} />
+                <GeneralContainerSettings organization={props.organization} isSetting />
               </div>
             ))}
         </>