diff -Nru google-osconfig-agent-20230330.00/agentendpoint/config_task.go google-osconfig-agent-20230504.00/agentendpoint/config_task.go
--- google-osconfig-agent-20230330.00/agentendpoint/config_task.go	2023-03-30 16:33:04.000000000 +0000
+++ google-osconfig-agent-20230504.00/agentendpoint/config_task.go	2023-05-04 18:45:45.000000000 +0000
@@ -344,8 +344,9 @@
 }
 
 func (c *configTask) cleanup(ctx context.Context) {
-	// Purge repositories that are no longer managed.
-	c.cleanupRepos(ctx)
+	// Skip repo clean-up, as there is no clear way how to find full list of repos,
+	// repos might be distributed across many tasks and there is no source of truth to find full list.
+	//c.cleanupRepos(ctx)
 
 	// Cleanup any policy specific resources.
 	for _, osPolicy := range c.Task.GetOsPolicies() {
diff -Nru google-osconfig-agent-20230330.00/config/package_resource_test.go google-osconfig-agent-20230504.00/config/package_resource_test.go
--- google-osconfig-agent-20230330.00/config/package_resource_test.go	2023-03-30 16:33:04.000000000 +0000
+++ google-osconfig-agent-20230504.00/config/package_resource_test.go	2023-05-04 18:45:45.000000000 +0000
@@ -412,6 +412,9 @@
 			aptInstalled,
 			func() []*exec.Cmd {
 				cmd1 := exec.Command("/usr/bin/apt-get", "update")
+				cmd1.Env = append(os.Environ(),
+					"DEBIAN_FRONTEND=noninteractive",
+				)
 				cmd2 := exec.Command("/usr/bin/apt-get", "install", "-y", "foo")
 				cmd2.Env = append(os.Environ(),
 					"DEBIAN_FRONTEND=noninteractive",
diff -Nru google-osconfig-agent-20230330.00/debian/changelog google-osconfig-agent-20230504.00/debian/changelog
--- google-osconfig-agent-20230330.00/debian/changelog	2023-04-26 22:37:14.000000000 +0000
+++ google-osconfig-agent-20230504.00/debian/changelog	2023-05-25 10:03:15.000000000 +0000
@@ -1,3 +1,15 @@
+google-osconfig-agent (20230504.00-0ubuntu1~22.04.0) jammy; urgency=medium
+
+  * No-change rebuild for Jammy.
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 25 May 2023 15:33:15 +0530
+
+google-osconfig-agent (20230504.00-0ubuntu1) mantic; urgency=medium
+
+  * New upstream version 20230504.00. (LP: #2020762)
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Thu, 25 May 2023 15:10:30 +0530
+
 google-osconfig-agent (20230330.00-0ubuntu1~22.04.0) jammy; urgency=medium
 
   * No-change rebuild for Jammy. (LP: #2015501)
diff -Nru google-osconfig-agent-20230330.00/packages/apt_deb.go google-osconfig-agent-20230504.00/packages/apt_deb.go
--- google-osconfig-agent-20230330.00/packages/apt_deb.go	2023-03-30 16:33:04.000000000 +0000
+++ google-osconfig-agent-20230504.00/packages/apt_deb.go	2023-05-04 18:45:45.000000000 +0000
@@ -319,7 +319,11 @@
 		return nil, err
 	}
 
-	out, _, err := runAptGetWithDowngradeRetrial(ctx, args, []cmdModifier{})
+	out, _, err := runAptGetWithDowngradeRetrial(ctx, args, []cmdModifier{
+		func(cmd *exec.Cmd) {
+			cmd.Env = append(os.Environ(), "DEBIAN_FRONTEND=noninteractive")
+		},
+	})
 	if err != nil {
 		return nil, err
 	}
@@ -329,7 +333,11 @@
 
 // AptUpdate runs apt-get update.
 func AptUpdate(ctx context.Context) ([]byte, error) {
-	stdout, _, err := runAptGet(ctx, aptGetUpdateArgs, []cmdModifier{})
+	stdout, _, err := runAptGet(ctx, aptGetUpdateArgs, []cmdModifier{
+		func(cmd *exec.Cmd) {
+			cmd.Env = append(os.Environ(), "DEBIAN_FRONTEND=noninteractive")
+		},
+	})
 	return stdout, err
 }
 
diff -Nru google-osconfig-agent-20230330.00/packages/apt_deb_test.go google-osconfig-agent-20230504.00/packages/apt_deb_test.go
--- google-osconfig-agent-20230330.00/packages/apt_deb_test.go	2023-03-30 16:33:04.000000000 +0000
+++ google-osconfig-agent-20230504.00/packages/apt_deb_test.go	2023-05-04 18:45:45.000000000 +0000
@@ -155,8 +155,18 @@
 
 	mockCommandRunner := utilmocks.NewMockCommandRunner(mockCtrl)
 	runner = mockCommandRunner
-	updateCmd := utilmocks.EqCmd(exec.Command(aptGet, aptGetUpdateArgs...))
-	expectedCmd := utilmocks.EqCmd(exec.Command(aptGet, append(aptGetUpgradableArgs, aptGetUpgradeCmd)...))
+
+	aptUpdateCmd := exec.Command(aptGet, aptGetUpdateArgs...)
+	aptUpdateCmd.Env = append(os.Environ(),
+		"DEBIAN_FRONTEND=noninteractive",
+	)
+	updateCmd := utilmocks.EqCmd(aptUpdateCmd)
+
+	aptUpgradeCmd := exec.Command(aptGet, append(aptGetUpgradableArgs, aptGetUpgradeCmd)...)
+	aptUpgradeCmd.Env = append(os.Environ(),
+		"DEBIAN_FRONTEND=noninteractive",
+	)
+	expectedCmd := utilmocks.EqCmd(aptUpgradeCmd)
 	data := []byte("Inst google-cloud-sdk [245.0.0-0] (246.0.0-0 cloud-sdk-stretch:cloud-sdk-stretch [amd64])")
 
 	first := mockCommandRunner.EXPECT().Run(testCtx, updateCmd).Return(data, []byte("stderr"), nil).Times(1)