diff --git a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
index 039b2a6e6..238ce5079 100644
--- a/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
+++ b/src/portal/src/app/base/project/repository/artifact/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.ts
@@ -716,7 +716,7 @@ export class ArtifactListTabComponent implements OnInit, OnDestroy {
     retag() {
         if (this.selectedRow && this.selectedRow.length && !this.depth) {
             this.retagDialogOpened = true;
-            this.imageNameInput.imageNameForm.reset();
+            this.imageNameInput.imageNameForm.reset({repoName: this.repoName});
             this.retagSrcImage = this.repoName + ":" + this.selectedRow[0].digest;
         }
     }
diff --git a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.html b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.html
index e9c44b03f..959e01627 100644
--- a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.html
+++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.html
@@ -10,7 +10,7 @@
                        (keyup)='validateProjectName()'
                        formControlName="projectName" autocomplete="off" />
                 <clr-icon class="clr-validate-icon" shape="exclamation-circle"></clr-icon>
-                <div class="select-box" [style.display]="selectedProjectList.length ? 'block' : 'none'">
+                <div class="selectBox" [style.display]="selectedProjectList.length ? 'block' : 'none'">
                     <ul>
                         <li *ngFor="let project of selectedProjectList"
                             (click)="selectedProjectName(project?.name)">{{project?.name}}</li>
diff --git a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss
index b417dafd5..cf13aff56 100644
--- a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss
+++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.scss
@@ -1,34 +1,28 @@
-
-.select-box {
+.selectBox{
     position: absolute;
+    width: 278px;
     height: auto;
     background-color: white;
-    border: 1px solid rgba(0, 0, 0, .15);
+    border: 1px solid rgba(0,0,0,.15);
     border-right-width: 2px;
     border-bottom-width: 2px;
     border-radius: 6px;
-    box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-    z-index:1;
-    width:100%;
-
-    ul {
-        li {
-            list-style: none;
-            padding: 3px 20px;
-            cursor: pointer;
-
-            &:hover {
-                color: #262626;
-                background-image: linear-gradient(180deg, #f5f5f5 0, #e8e8e8);
-                background-repeat: repeat-x;
-            }
-        }
-    }
+    box-shadow: 0 5px 10px rgba(0,0,0,.2);
+    z-index: 100;
+}
+.selectBox ul li{
+    list-style: none;
+    padding: 3px 20px;
+    cursor: pointer;
+}
+.selectBox ul li:hover{
+    color: #262626;
+    background-image: linear-gradient(180deg,#f5f5f5 0,#e8e8e8);
+    background-repeat: repeat-x;
 }
 
 .clr-input-wrapper {
     width: 100%;
-    position: relative;
 }
 
 .wrap-label {
@@ -42,5 +36,5 @@
     width: 60%;
 }
 .w-90 {
-    width: 90%;
+    width: 278px;
 }
diff --git a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts
index 007bb72d1..9c6542d8c 100644
--- a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts
+++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.spec.ts
@@ -1,10 +1,9 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { ImageNameInputComponent } from "./image-name-input.component";
-import { ProjectDefaultService, ProjectService } from "../../services";
-import { Project } from "../../../base/project/project-config/project-policy-config/project";
 import { of } from "rxjs";
-import { HttpResponse } from "@angular/common/http";
 import { SharedTestingModule } from "../../shared.module";
+import { ProjectService } from "ng-swagger-gen/services/project.service";
+import { Project } from "ng-swagger-gen/models/project";
 
 describe("ImageNameInputComponent (inline template)", () => {
     let comp: ImageNameInputComponent;
@@ -31,9 +30,6 @@ describe("ImageNameInputComponent (inline template)", () => {
             declarations: [
                 ImageNameInputComponent
             ],
-            providers: [
-                { provide: ProjectService, useClass: ProjectDefaultService }
-            ]
         }).compileComponents();
     });
 
@@ -43,7 +39,7 @@ describe("ImageNameInputComponent (inline template)", () => {
 
         let projectService: ProjectService;
         projectService = fixture.debugElement.injector.get(ProjectService);
-        spy = spyOn(projectService, "listProjects").and.returnValues(of(new HttpResponse({ body: mockProjects })));
+        spy = spyOn(projectService, "listProjects").and.returnValues(of(mockProjects));
     });
 
     it("should load data", () => {
diff --git a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts
index 7f544c54f..34728ce33 100644
--- a/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts
+++ b/src/portal/src/app/shared/components/image-name-input/image-name-input.component.ts
@@ -1,10 +1,10 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { Project } from "../../../base/project/project-config/project-policy-config/project";
 import { Subject } from "rxjs";
 import { debounceTime, switchMap } from "rxjs/operators";
-import { ProjectService } from "../../services";
 import { AbstractControl, FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { ErrorHandler } from "../../units/error-handler";
+import { ProjectService } from "ng-swagger-gen/services/project.service";
+import { Project } from "ng-swagger-gen/models/project";
 
 @Component({
     selector: "hbr-image-name-input",
@@ -46,13 +46,17 @@ export class ImageNameInputComponent implements OnInit, OnDestroy {
                 switchMap(name => {
                     this.noProjectInfo = "";
                     this.selectedProjectList = [];
-                    return this.proService.listProjects(name, undefined);
+                    return this.proService.listProjects({
+                        name: name,
+                        page: 1,
+                        pageSize: 10
+                    });
                 })
             ).subscribe(response => {
-            if (response.body) {
-                this.selectedProjectList = response.body.slice(0, 10);
+            if (response) {
+                this.selectedProjectList = response;
                 // if input project name exist in the project list
-                let exist = response.body.find((data: any) => data.name === this.imageNameForm.controls["projectName"].value);
+                let exist = response.find((data: Project) => data.name === this.imageNameForm.controls["projectName"].value);
                 if (!exist) {
                     this.noProjectInfo = "REPLICATION.NO_PROJECT_INFO";
                 } else {