diff --git a/libs/components/src/lib/components/CreateClanModal/index.tsx b/libs/components/src/lib/components/CreateClanModal/index.tsx
index 552d329ac9..c6973ea720 100644
--- a/libs/components/src/lib/components/CreateClanModal/index.tsx
+++ b/libs/components/src/lib/components/CreateClanModal/index.tsx
@@ -169,7 +169,7 @@ const ModalCreateClans = (props: ModalCreateClansProps) => {
 									<span className="text-[14px]">{t('createClanModal.upload')}</span>
 								</div>
 							)}
-							<input id="preview_img" type="file" onChange={(e) => handleFile(e)} className="w-full text-sm hidden" />
+							<input id="preview_img" type="file" onChange={(e) => handleFile(e)} className="w-full text-sm hidden" data-e2e={generateE2eId('clan_page.modal.create_clan.input.upload_avatar_clan')} />
 						</label>
 						<div className="w-full">
 							<span className="font-[700] text-[16px] leading-6">{t('createClanModal.clanName')}</span>
diff --git a/libs/components/src/lib/components/ModalEditGroup/index.tsx b/libs/components/src/lib/components/ModalEditGroup/index.tsx
index 80595a8b70..3e23b727f2 100644
--- a/libs/components/src/lib/components/ModalEditGroup/index.tsx
+++ b/libs/components/src/lib/components/ModalEditGroup/index.tsx
@@ -142,7 +142,7 @@ const ModalEditGroup: React.FC<ModalEditGroupProps> = ({
 									</div>
 								</div>
 							</div>
-							<input ref={fileInputRef} type="file" accept="image/*" onChange={handleImageChange} className="hidden" />
+							<input ref={fileInputRef} type="file" accept="image/*" onChange={handleImageChange} className="hidden" data-e2e={generateE2eId('chat.direct_message.edit_group.upload.avatar_group_input')} />
 							<p className="text-xs text-theme-primary font-medium">{t('editGroup.uploadImageText')}</p>
 							{imagePreview && !imagePreview.includes('assets/images/avatar-group.png') && (
 								<button
diff --git a/libs/components/src/lib/components/SettingProfile/SettingRightUserProfile/index.tsx b/libs/components/src/lib/components/SettingProfile/SettingRightUserProfile/index.tsx
index 4c8a192f79..3c86dec2b2 100644
--- a/libs/components/src/lib/components/SettingProfile/SettingRightUserProfile/index.tsx
+++ b/libs/components/src/lib/components/SettingProfile/SettingRightUserProfile/index.tsx
@@ -367,6 +367,7 @@ const SettingRightUser = ({
 									id="logo"
 									onChange={handleChangeLogo}
 									className="w-full absolute top-0 left-0 h-full text-sm hidden"
+									data-e2e={generateE2eId('user_setting.profile.user_profile.upload.direct_message_icon_input')}
 								/>
 							</label>
 						</div>
diff --git a/libs/utils/src/lib/e2e-testing/constants.ts b/libs/utils/src/lib/e2e-testing/constants.ts
index 1673cf4a7b..87729c2a00 100644
--- a/libs/utils/src/lib/e2e-testing/constants.ts
+++ b/libs/utils/src/lib/e2e-testing/constants.ts
@@ -104,7 +104,8 @@ export const DATA_E2E_IDENTIFIER = {
 			},
 			create_clan: {
 				input: {
-					clan_name: ''
+					clan_name: '',
+					upload_avatar_clan: ''
 				},
 				toggle: {
 					private: ''
@@ -240,7 +241,10 @@ export const DATA_E2E_IDENTIFIER = {
 			edit_group: {
 				button: '',
 				input: '',
-				save_button: ''
+				save_button: '',
+				upload: {
+					avatar_group_input: ''
+				}
 			},
 			leave_group: {
 				button: ''
@@ -363,6 +367,9 @@ export const DATA_E2E_IDENTIFIER = {
 				},
 				text: {
 					about_me_length: ''
+				},
+				upload: {
+					direct_message_icon_input: ''
 				}
 			},
 			clan_profile: {