diff --git a/integration/test/installer/harvest.go b/integration/test/installer/harvest.go
index 41c4d26e4..65d28600d 100644
--- a/integration/test/installer/harvest.go
+++ b/integration/test/installer/harvest.go
@@ -20,7 +20,6 @@ func (h *Harvest) Start() {
 	fmt.Println(status)
 	time.Sleep(30 * time.Second)
 	h.AllRunning()
-
 }
 
 func (h *Harvest) StartByHarvestUser() {
diff --git a/integration/test/installer/native.go b/integration/test/installer/native.go
index 5dc4ae7f3..d3a018200 100644
--- a/integration/test/installer/native.go
+++ b/integration/test/installer/native.go
@@ -30,15 +30,7 @@ func (n *Native) Install() bool {
 	unTarOutput := utils.Run("tar", "-xf", tarFileName, "--one-top-level=harvest", "--strip-components", "1", "-C", "/opt")
 	log.Println(unTarOutput)
 	utils.RemoveSafely(HarvestHome + "/" + harvestFile)
-	log.Println("Copy certificates files into harvest directory")
-	path := HarvestHome + "/certificates"
-	if utils.FileExists(path) {
-		err = utils.RemoveDir(path)
-		utils.PanicIfNotNil(err)
-	}
-
-	utils.Run("mkdir", "-p", path)
-	utils.Run("cp", "-R", utils.GetConfigDir()+"/certificates", HarvestHome)
+	utils.UseCertFile(HarvestHome)
 	utils.Run("cp", setup.GetPerfFileWithQosCounters(setup.ZapiPerfDefaultFile, "defaultZapi.yaml"), HarvestHome+"/"+setup.ZapiPerfDefaultFile)
 	utils.Run("cp", setup.GetPerfFileWithQosCounters(setup.RestPerfDefaultFile, "defaultRest.yaml"), HarvestHome+"/"+setup.RestPerfDefaultFile)
 	err = utils.CopyFile(harvestFile, HarvestHome+"/"+harvestFile)
diff --git a/integration/test/installer/rpm.go b/integration/test/installer/rpm.go
index 29c8e618f..bf9e0e794 100644
--- a/integration/test/installer/rpm.go
+++ b/integration/test/installer/rpm.go
@@ -30,15 +30,8 @@ func (r *RPM) Install() bool {
 	log.Println("Installing " + rpmFileName)
 	installOutput := utils.Run("yum", "install", "-y", rpmFileName)
 	log.Println(installOutput)
-	log.Println("Stopping harvest before copying ONTAP certificates")
+	log.Println("Stopping harvest")
 	harvestObj.Stop()
-	log.Println("Copy certificates files into harvest directory")
-	path := HarvestHome + "/certificates"
-	if utils.FileExists(path) {
-		err = utils.RemoveDir(path)
-		utils.PanicIfNotNil(err)
-	}
-	utils.Run("mkdir", "-p", path)
 	utils.Run("cp", "-R", utils.GetConfigDir()+"/certificates", HarvestHome)
 	copyErr := utils.CopyFile(harvestFile, HarvestHome+"/harvest.yml")
 	if copyErr != nil {
diff --git a/integration/test/native_installer_test.go b/integration/test/native_installer_test.go
index 282300df9..8706ab7cb 100644
--- a/integration/test/native_installer_test.go
+++ b/integration/test/native_installer_test.go
@@ -1,5 +1,4 @@
 //go:build install_native
-// +build install_native
 
 package main
 
@@ -17,7 +16,6 @@ func TestNativeInstall(t *testing.T) {
 	if len(path) == 0 {
 		panic("BUILD_PATH variable is not set.")
 	}
-	utils.UseCertFile()
 	installObject, err := installer.GetInstaller(installer.GRAFANA, "grafana/grafana")
 	if err != nil {
 		log.Println("Unable to initialize installer object for " + installer.GRAFANA)
@@ -29,10 +27,10 @@ func TestNativeInstall(t *testing.T) {
 	token := utils.CreateGrafanaToken()
 	utils.WriteToken(token)
 
-	installObject, error := installer.GetInstaller(installer.NATIVE, path)
-	if error != nil {
+	installObject, err2 := installer.GetInstaller(installer.NATIVE, path)
+	if err2 != nil {
 		log.Println("Unable to initialize installer object")
-		panic(error)
+		panic(err2)
 	}
 	if installObject.Install() {
 		log.Println("Installation is successful..")
diff --git a/integration/test/rpm_installer_test.go b/integration/test/rpm_installer_test.go
index 049b7d43a..5a99f236a 100644
--- a/integration/test/rpm_installer_test.go
+++ b/integration/test/rpm_installer_test.go
@@ -16,7 +16,6 @@ func TestRHELInstall(t *testing.T) {
 	if len(path) == 0 {
 		panic("BUILD_PATH variable is not set.")
 	}
-	utils.UseCertFile()
 	installObject, err := installer.GetInstaller(installer.GRAFANA, "grafana/grafana")
 	if err != nil {
 		log.Println("Unable to initialize installer object for " + installer.GRAFANA)
@@ -28,10 +27,10 @@ func TestRHELInstall(t *testing.T) {
 	token := utils.CreateGrafanaToken()
 	utils.WriteToken(token)
 
-	installObject, error := installer.GetInstaller(installer.RHEL, path)
-	if error != nil {
+	installObject, err2 := installer.GetInstaller(installer.RHEL, path)
+	if err2 != nil {
 		log.Println("Unable to initialize installer object")
-		panic(error)
+		panic(err2)
 	}
 	if installObject.Install() {
 		log.Println("Installation is successful..")
diff --git a/integration/test/utils/utils.go b/integration/test/utils/utils.go
index b8496680c..9287719d5 100644
--- a/integration/test/utils/utils.go
+++ b/integration/test/utils/utils.go
@@ -135,14 +135,21 @@ func RemoveDir(dir string) error {
 	return nil
 }
 
-func UseCertFile() {
+func UseCertFile(harvestHome string) {
+	// Copy harvest_cert_2023.yml from /u/ to local
+	harvestCertFile := "harvest_cert_2023.yml"
 	harvestFile := "harvest.yml"
-	harvestCertFile := "harvest_cert.yml"
-	RemoveSafely(harvestFile)
-	err := CopyFile(harvestCertFile, harvestFile)
-	if err != nil {
+	Run("cp", "-p", GetConfigDir()+"/"+harvestCertFile, harvestHome+"/"+harvestFile)
+	Run("certer", "-ip", "10.193.48.11")
+
+	path := harvestHome + "/cert"
+	log.Info().Str("path", path).Msg("Copy certificate files")
+	if FileExists(path) {
+		err := RemoveDir(path)
 		PanicIfNotNil(err)
 	}
+	Run("mkdir", "-p", path)
+	Run("cp", "-R", GetConfigDir()+"/cert", harvestHome)
 }
 
 func RemoveSafely(filename string) bool {