diff --git a/cmd/finch/version_test.go b/cmd/finch/version_test.go
index f5f4c31f5..9ae52d9ee 100644
--- a/cmd/finch/version_test.go
+++ b/cmd/finch/version_test.go
@@ -52,7 +52,8 @@ func TestVersionAction_runAdaptor(t *testing.T) {
 				logger.EXPECT().Debugf("Status of virtual machine: %s", "Running")
 
 				command := mocks.NewCommand(ctrl)
-				lcc.EXPECT().CreateWithoutStdio("shell", limaInstanceName, "sudo", "-E", "nerdctl", "version", "--format", "json").Return(command)
+				lcc.EXPECT().CreateWithoutStdio("shell", limaInstanceName, "sudo", "-E", "nerdctl", "version",
+					"--format", "json").Return(command)
 				//nolint: lll	// Version output format is larger than 500
 				command.EXPECT().Output().Return([]byte(`{"Client":{"Version":"v1.0.0","GitCommit":"c00780a1f5b905b09812722459c54936c9e070e6","GoVersion":"go1.19.2","Os":"linux","Arch":"arm64","Components":[{"Name":"buildctl","Version":"v0.10.5","Details":{"GitCommit":"bc26045116045516ff2427201abd299043eaf8f7"}}]},"Server":{"Components":[{"Name":"containerd","Version":"v1.6.8","Details":{"GitCommit":"9cd3357b7fd7218e4aec3eae239db1f68a5a6ec6"}},{"Name":"runc","Version":"1.1.4","Details":{"GitCommit":"v1.1.4-0-g5fd4c4d1"}}]}}`), nil)
 			},
@@ -98,7 +99,8 @@ func TestVersionAction_run(t *testing.T) {
 				logger.EXPECT().Debugf("Status of virtual machine: %s", "Running")
 
 				command := mocks.NewCommand(ctrl)
-				lcc.EXPECT().CreateWithoutStdio("shell", limaInstanceName, "sudo", "-E", "nerdctl", "version", "--format", "json").Return(command)
+				lcc.EXPECT().CreateWithoutStdio("shell", limaInstanceName, "sudo", "-E", "nerdctl", "version",
+					"--format", "json").Return(command)
 				command.EXPECT().Output().Return([]byte(`{
 					"Client":{
 						"Version":"v1.0.0",
diff --git a/e2e/vm/finch_config_file_test.go b/e2e/vm/finch_config_file_test.go
index a5480bc38..caec65986 100644
--- a/e2e/vm/finch_config_file_test.go
+++ b/e2e/vm/finch_config_file_test.go
@@ -22,8 +22,8 @@ var testFinchConfigFile = func(o *option.Option) {
 	ginkgo.Describe("finch config file", func() {
 		ginkgo.It("should store login credentials", func() {
 			filename := "htpasswd"
-			registryImage := "public.ecr.aws/docker/library/registry:latest"
-			registryContainer := "registry"
+			registryImage := "public.ecr.aws/docker/library/registry:2"
+			registryContainer := "auth-registry"
 			// The htpasswd is generated by
 			// `finch run --entrypoint htpasswd public.ecr.aws/docker/library/httpd:2 -Bbn testUser testPassword`.
 			// We don't want to generate it on the fly because: