diff --git a/tests/resources/Harbor-Pages/Project.robot b/tests/resources/Harbor-Pages/Project.robot
index 65fcf99d0..7dbe30122 100644
--- a/tests/resources/Harbor-Pages/Project.robot
+++ b/tests/resources/Harbor-Pages/Project.robot
@@ -197,14 +197,13 @@ Do Log Advanced Search
 
 Go Into Repo
     [Arguments]  ${repoName}
-    Sleep  2
-    Click Element  xpath=//hbr-filter//clr-icon
-    Sleep  2
-    Input Text  xpath=//hbr-filter//input  ${repoName}
-    Sleep  3
-    Wait Until Page Contains  ${repoName}
-    Click Element  xpath=//clr-dg-cell[contains(.,${repoName})]/a
-    Sleep  2
+    ${repo_name_element}=  Set Variable  xpath=//clr-dg-cell[contains(.,'${repoName}')]/a
+    Retry Element Click  ${repo_search_icon}
+    Retry Text Input  ${repo_search_input}  ${repoName}
+    Retry Element Click  ${repo_name_element}
+    Retry Wait Element  ${tag_table_column_signed}
+    Retry Wait Element  ${tag_table_column_vulnerability}
+    Retry Wait Element  ${tag_images_btn}
     Capture Page Screenshot  gointo_${repoName}.png
 
 Switch To CardView
diff --git a/tests/resources/Harbor-Pages/Project_Elements.robot b/tests/resources/Harbor-Pages/Project_Elements.robot
index d969816ee..548be5794 100644
--- a/tests/resources/Harbor-Pages/Project_Elements.robot
+++ b/tests/resources/Harbor-Pages/Project_Elements.robot
@@ -38,3 +38,9 @@ ${repo_delete_btn}  xpath=//repository//button[contains(.,'Delete')]
 ${project_delete_btn}  xpath=//list-project//clr-datagrid//button[contains(.,'Delete')]
 ${tag_delete_btn}  xpath=//tag-repository//clr-datagrid//button[contains(.,'Delete')]
 ${user_delete_btn}  xpath=/clr-dropdown-menu//button[contains(.,'Delete')]
+${repo_search_icon}  xpath=//hbr-filter//clr-icon
+${repo_search_input}  xpath=//hbr-filter//input
+${repo_tag_1st_checkbox}  xpath=//clr-datagrid//clr-dg-row//clr-checkbox-wrapper
+${tag_table_column_signed}  xpath=//clr-dg-column//span[contains(.,'Signed')]
+${tag_table_column_vulnerability}  xpath=//clr-dg-column//span[contains(.,'Vulnerability')]
+${tag_images_btn}  xpath=//hbr-repository//button[contains(.,'Images')]