diff --git a/auctioncellrep/auction_cell_rep.go b/auctioncellrep/auction_cell_rep.go
index b4c47ef6..838b1676 100644
--- a/auctioncellrep/auction_cell_rep.go
+++ b/auctioncellrep/auction_cell_rep.go
@@ -9,7 +9,7 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )
diff --git a/auctioncellrep/auction_cell_rep_suite_test.go b/auctioncellrep/auction_cell_rep_suite_test.go
index 5ebc8e3e..1711179f 100644
--- a/auctioncellrep/auction_cell_rep_suite_test.go
+++ b/auctioncellrep/auction_cell_rep_suite_test.go
@@ -1,7 +1,7 @@
 package auctioncellrep_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/auctioncellrep/auction_cell_rep_test.go b/auctioncellrep/auction_cell_rep_test.go
index b687037d..f1a79490 100644
--- a/auctioncellrep/auction_cell_rep_test.go
+++ b/auctioncellrep/auction_cell_rep_test.go
@@ -7,12 +7,12 @@ import (
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/containermetrics"
 	fake_client "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
 	fakes "code.cloudfoundry.org/rep/auctioncellrep/auctioncellrepfakes"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/auctioncellrep/auctioncellrepfakes/fake_auction_cell_client.go b/auctioncellrep/auctioncellrepfakes/fake_auction_cell_client.go
index 8786ed79..c56ca5e0 100644
--- a/auctioncellrep/auctioncellrepfakes/fake_auction_cell_client.go
+++ b/auctioncellrep/auctioncellrepfakes/fake_auction_cell_client.go
@@ -4,7 +4,7 @@ package auctioncellrepfakes
 import (
 	"sync"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
 )
diff --git a/auctioncellrep/auctioncellrepfakes/fake_batch_container_allocator.go b/auctioncellrep/auctioncellrepfakes/fake_batch_container_allocator.go
index 6649599c..8adbbc50 100644
--- a/auctioncellrep/auctioncellrepfakes/fake_batch_container_allocator.go
+++ b/auctioncellrep/auctioncellrepfakes/fake_batch_container_allocator.go
@@ -4,7 +4,7 @@ package auctioncellrepfakes
 import (
 	"sync"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
 )
diff --git a/auctioncellrep/batch_container_allocator.go b/auctioncellrep/batch_container_allocator.go
index b4f3557d..cef4c620 100644
--- a/auctioncellrep/batch_container_allocator.go
+++ b/auctioncellrep/batch_container_allocator.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/auctioncellrep/batch_container_allocator_test.go b/auctioncellrep/batch_container_allocator_test.go
index 025b1e21..5c666474 100644
--- a/auctioncellrep/batch_container_allocator_test.go
+++ b/auctioncellrep/batch_container_allocator_test.go
@@ -9,10 +9,10 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/executor"
 	fake_client "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )
diff --git a/auctioncellrep/helpers_test.go b/auctioncellrep/helpers_test.go
index cb1ea6fa..da9950a9 100644
--- a/auctioncellrep/helpers_test.go
+++ b/auctioncellrep/helpers_test.go
@@ -2,7 +2,7 @@ package auctioncellrep_test
 
 import (
 	"code.cloudfoundry.org/rep/auctioncellrep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/client.go b/client.go
index 64660dbd..0fa6745e 100644
--- a/client.go
+++ b/client.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/bbs/models"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/tlsconfig"
 	"github.com/tedsuo/rata"
 )
diff --git a/client_test.go b/client_test.go
index d525bd1f..edc8cc2b 100644
--- a/client_test.go
+++ b/client_test.go
@@ -9,11 +9,11 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	cfhttp "code.cloudfoundry.org/cfhttp/v2"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/routing-info/internalroutes"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/ghttp"
diff --git a/cmd/gocurl/main_suite_test.go b/cmd/gocurl/main_suite_test.go
index 20e039e2..813c70f6 100644
--- a/cmd/gocurl/main_suite_test.go
+++ b/cmd/gocurl/main_suite_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
diff --git a/cmd/gocurl/main_test.go b/cmd/gocurl/main_test.go
index 0e5c6f1e..9d1360e3 100644
--- a/cmd/gocurl/main_test.go
+++ b/cmd/gocurl/main_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/tlsconfig"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/ghttp"
 )
diff --git a/cmd/rep/config/config.go b/cmd/rep/config/config.go
index 72dd4fdb..9e385450 100644
--- a/cmd/rep/config/config.go
+++ b/cmd/rep/config/config.go
@@ -11,7 +11,7 @@ import (
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
 	executorinit "code.cloudfoundry.org/executor/initializer"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/rep"
 )
diff --git a/cmd/rep/config/config_suite_test.go b/cmd/rep/config/config_suite_test.go
index 6508e6da..4d4d240f 100644
--- a/cmd/rep/config/config_suite_test.go
+++ b/cmd/rep/config/config_suite_test.go
@@ -1,7 +1,7 @@
 package config_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/cmd/rep/config/config_test.go b/cmd/rep/config/config_test.go
index 7c45e856..5b693b18 100644
--- a/cmd/rep/config/config_test.go
+++ b/cmd/rep/config/config_test.go
@@ -10,10 +10,10 @@ import (
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/durationjson"
 	executorinit "code.cloudfoundry.org/executor/initializer"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/rep/cmd/rep/config"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/cmd/rep/main.go b/cmd/rep/main.go
index 6e66de95..482cd9bb 100644
--- a/cmd/rep/main.go
+++ b/cmd/rep/main.go
@@ -24,8 +24,8 @@ import (
 	"code.cloudfoundry.org/executor"
 	executorinit "code.cloudfoundry.org/executor/initializer"
 	"code.cloudfoundry.org/go-loggregator/v8/runtimeemitter"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagerflags"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
 	"code.cloudfoundry.org/localip"
 	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/locket/lock"
@@ -179,21 +179,21 @@ func main() {
 	)
 
 	members := grouper.Members{
-		{"presence", cellPresence},
-		{"http_server", httpServer},
-		{"https_server", httpsServer},
-		{"evacuation-cleanup", cleanup},
-		{"bulker", bulker},
-		{"event-consumer", harmonizer.NewEventConsumer(logger, opGenerator, queue)},
-		{"evacuator", evacuator},
-		{"request-metrics-notifier", requestMetrics},
+		{Name: "presence", Runner: cellPresence},
+		{Name: "http_server", Runner: httpServer},
+		{Name: "https_server", Runner: httpsServer},
+		{Name: "evacuation-cleanup", Runner: cleanup},
+		{Name: "bulker", Runner: bulker},
+		{Name: "event-consumer", Runner: harmonizer.NewEventConsumer(logger, opGenerator, queue)},
+		{Name: "evacuator", Runner: evacuator},
+		{Name: "request-metrics-notifier", Runner: requestMetrics},
 	}
 
 	members = append(executorMembers, members...)
 
 	if repConfig.DebugAddress != "" {
 		members = append(grouper.Members{
-			{"debug-server", debugserver.Runner(repConfig.DebugAddress, reconfigurableSink)},
+			{Name: "debug-server", Runner: debugserver.Runner(repConfig.DebugAddress, reconfigurableSink)},
 		}, members...)
 	}
 
diff --git a/cmd/rep/main_suite_test.go b/cmd/rep/main_suite_test.go
index da608674..2a44ac65 100644
--- a/cmd/rep/main_suite_test.go
+++ b/cmd/rep/main_suite_test.go
@@ -23,17 +23,17 @@ import (
 	"code.cloudfoundry.org/durationjson"
 	"code.cloudfoundry.org/go-loggregator/v8/rpc/loggregator_v2"
 	"code.cloudfoundry.org/inigo/helpers/portauthority"
-	"code.cloudfoundry.org/lager/lagerflags"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/locket"
 	locketconfig "code.cloudfoundry.org/locket/cmd/locket/config"
 	locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 	"google.golang.org/grpc/grpclog"
 )
 
diff --git a/cmd/rep/main_test.go b/cmd/rep/main_test.go
index 321a12cb..e905e495 100644
--- a/cmd/rep/main_test.go
+++ b/cmd/rep/main_test.go
@@ -27,9 +27,9 @@ import (
 	"code.cloudfoundry.org/executor/initializer/configuration"
 	"code.cloudfoundry.org/garden"
 	"code.cloudfoundry.org/garden/transport"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagerflags"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagerflags"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/locket"
 	locketrunner "code.cloudfoundry.org/locket/cmd/locket/testrunner"
 	locketmodels "code.cloudfoundry.org/locket/models"
@@ -37,12 +37,12 @@ import (
 	"code.cloudfoundry.org/rep/cmd/rep/config"
 	"code.cloudfoundry.org/rep/cmd/rep/testrunner"
 	"code.cloudfoundry.org/tlsconfig"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
 	"github.com/onsi/gomega/ghttp"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 )
 
 var runner *testrunner.Runner
@@ -232,12 +232,16 @@ var _ = Describe("The Rep", func() {
 		runner.Start()
 	})
 
-	AfterEach(func(done Done) {
-		close(flushEvents)
-		runner.KillWithFire()
-		fakeGarden.Close()
-		close(done)
-		// ginkgomon.Kill(locketProcess)
+	AfterEach(func() {
+		done := make(chan interface{})
+		go func() {
+			close(flushEvents)
+			runner.KillWithFire()
+			fakeGarden.Close()
+			close(done)
+			ginkgomon.Kill(locketProcess)
+		}()
+		Eventually(done).Should(BeClosed())
 	})
 
 	Context("the rep doesn't start", func() {
diff --git a/cmd/rep/testrunner/runner.go b/cmd/rep/testrunner/runner.go
index 5b6e079b..0857a140 100644
--- a/cmd/rep/testrunner/runner.go
+++ b/cmd/rep/testrunner/runner.go
@@ -9,7 +9,7 @@ import (
 
 	"code.cloudfoundry.org/rep/cmd/rep/config"
 
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 )
diff --git a/conversion_helpers_test.go b/conversion_helpers_test.go
index bb3fce07..c72d1d2c 100644
--- a/conversion_helpers_test.go
+++ b/conversion_helpers_test.go
@@ -14,7 +14,7 @@ import (
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/routing-info/internalroutes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/evacuation/cleanup.go b/evacuation/cleanup.go
index ac44e728..2f74b329 100644
--- a/evacuation/cleanup.go
+++ b/evacuation/cleanup.go
@@ -12,7 +12,7 @@ import (
 	"code.cloudfoundry.org/clock"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 const (
diff --git a/evacuation/cleanup_test.go b/evacuation/cleanup_test.go
index 27b40b58..edcab15c 100644
--- a/evacuation/cleanup_test.go
+++ b/evacuation/cleanup_test.go
@@ -14,14 +14,14 @@ import (
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep/evacuation"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/tedsuo/ifrit"
-	"github.com/tedsuo/ifrit/ginkgomon"
+	ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
 )
 
 var _ = Describe("EvacuationCleanup", func() {
@@ -163,36 +163,37 @@ var _ = Describe("EvacuationCleanup", func() {
 		})
 
 		Describe("deleting running containers", func() {
-			It("should delete all of the containers that are still running", func() {
-				fakeExecutorClient.ListContainersReturnsOnCall(1,
-					[]executor.Container{
-						{
-							Guid:    "container1",
-							State:   executor.StateRunning,
-							RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-1", SourceName: "source-name-1", Index: 0}},
-						},
-						{Guid: "container2",
-							State:   executor.StateCompleted,
-							RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-2", SourceName: "source-name-2", Index: 1}},
+			Context("When containers fail to exit initially", func() {
+				BeforeEach(func() {
+					fakeExecutorClient.ListContainersReturnsOnCall(1,
+						[]executor.Container{
+							{
+								Guid:    "container1",
+								State:   executor.StateRunning,
+								RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-1", SourceName: "source-name-1", Index: 0}},
+							},
+							{Guid: "container2",
+								State:   executor.StateCompleted,
+								RunInfo: executor.RunInfo{LogConfig: executor.LogConfig{Guid: "log-guid-2", SourceName: "source-name-2", Index: 1}},
+							},
 						},
-					},
-					nil,
-				)
-				fakeExecutorClient.ListContainersReturnsOnCall(2, []executor.Container{}, nil)
-
-				Consistently(errCh).ShouldNot(Receive())
-				fakeClock.Increment(time.Second * 1)
+						nil,
+					)
+				})
+				It("should delete all of the containers that are still running", func() {
+					Consistently(errCh).ShouldNot(Receive())
+					fakeClock.Increment(time.Second * 1)
 
-				Eventually(errCh).Should(Receive(nil))
-				Expect(fakeExecutorClient.ListContainersCallCount()).To(Equal(3))
-				Expect(fakeExecutorClient.DeleteContainerCallCount()).To(Equal(2))
+					Eventually(errCh).Should(Receive(nil))
+					Expect(fakeExecutorClient.ListContainersCallCount()).To(Equal(3))
+					Expect(fakeExecutorClient.DeleteContainerCallCount()).To(Equal(2))
 
-				_, c1 := fakeExecutorClient.DeleteContainerArgsForCall(0)
-				_, c2 := fakeExecutorClient.DeleteContainerArgsForCall(1)
-				containers := []string{c1, c2}
-				Expect(containers).To(ConsistOf("container1", "container2"))
+					_, c1 := fakeExecutorClient.DeleteContainerArgsForCall(0)
+					_, c2 := fakeExecutorClient.DeleteContainerArgsForCall(1)
+					containers := []string{c1, c2}
+					Expect(containers).To(ConsistOf("container1", "container2"))
+				})
 			})
-
 			It("emits app logs indicating evacuation timeout", func() {
 				Eventually(fakeMetronClient.SendAppLogCallCount).Should(Equal(2))
 				msg, containerSource, tags := fakeMetronClient.SendAppLogArgsForCall(0)
diff --git a/evacuation/evacuation.go b/evacuation/evacuation.go
index f42341ba..0182cb01 100644
--- a/evacuation/evacuation.go
+++ b/evacuation/evacuation.go
@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )
 
@@ -74,8 +74,6 @@ func (e *Evacuator) Run(signals <-chan os.Signal, ready chan<- struct{}) error {
 		logger.Info("signaled", lager.Data{"signal": signal.String()})
 		return nil
 	}
-
-	return nil
 }
 
 func (e *Evacuator) evacuate(logger lager.Logger, doneCh chan<- struct{}) {
diff --git a/evacuation/evacuation_context/evacuation_context_suite_test.go b/evacuation/evacuation_context/evacuation_context_suite_test.go
index 24d6882b..cdd44a81 100644
--- a/evacuation/evacuation_context/evacuation_context_suite_test.go
+++ b/evacuation/evacuation_context/evacuation_context_suite_test.go
@@ -1,7 +1,7 @@
 package evacuation_context_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/evacuation/evacuation_context/evacuation_context_test.go b/evacuation/evacuation_context/evacuation_context_test.go
index 9d96456e..e9833340 100644
--- a/evacuation/evacuation_context/evacuation_context_test.go
+++ b/evacuation/evacuation_context/evacuation_context_test.go
@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/evacuation/evacuation_suite_test.go b/evacuation/evacuation_suite_test.go
index 7155ef99..b02ee916 100644
--- a/evacuation/evacuation_suite_test.go
+++ b/evacuation/evacuation_suite_test.go
@@ -1,7 +1,7 @@
 package evacuation_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/evacuation/evacuation_test.go b/evacuation/evacuation_test.go
index 00973ec2..d7b27950 100644
--- a/evacuation/evacuation_test.go
+++ b/evacuation/evacuation_test.go
@@ -8,14 +8,14 @@ import (
 	"code.cloudfoundry.org/clock/fakeclock"
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 	"github.com/tedsuo/ifrit"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/generator/fake_generator/fake_generator.go b/generator/fake_generator/fake_generator.go
index 51259993..add31b87 100644
--- a/generator/fake_generator/fake_generator.go
+++ b/generator/fake_generator/fake_generator.go
@@ -4,7 +4,7 @@ package fake_generator
 import (
 	"sync"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/rep/generator"
 )
diff --git a/generator/generator.go b/generator/generator.go
index ba18992d..a4558758 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
diff --git a/generator/generator_suite_test.go b/generator/generator_suite_test.go
index daff9c6b..0a4f9939 100644
--- a/generator/generator_suite_test.go
+++ b/generator/generator_suite_test.go
@@ -2,8 +2,8 @@ package generator_test
 
 import (
 	"code.cloudfoundry.org/bbs/fake_bbs"
-	"code.cloudfoundry.org/lager/lagertest"
-	. "github.com/onsi/ginkgo"
+	"code.cloudfoundry.org/lager/v3/lagertest"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/generator/generator_test.go b/generator/generator_test.go
index 0e3f5124..32d79d50 100644
--- a/generator/generator_test.go
+++ b/generator/generator_test.go
@@ -10,7 +10,7 @@ import (
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
 	"code.cloudfoundry.org/rep/generator"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 )
diff --git a/generator/internal/container_delegate.go b/generator/internal/container_delegate.go
index 2036da58..93139e28 100644
--- a/generator/internal/container_delegate.go
+++ b/generator/internal/container_delegate.go
@@ -7,7 +7,7 @@ import (
 	"io"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 )
 
 const MAX_RESULT_SIZE = 1024 * 50
diff --git a/generator/internal/container_delegate_test.go b/generator/internal/container_delegate_test.go
index 7c049c82..6c4c63cd 100644
--- a/generator/internal/container_delegate_test.go
+++ b/generator/internal/container_delegate_test.go
@@ -8,10 +8,10 @@ import (
 	"code.cloudfoundry.org/archiver/extractor/test_helper"
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep/generator/internal"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )
diff --git a/generator/internal/evacuation_lrp_processor.go b/generator/internal/evacuation_lrp_processor.go
index 8df787c9..88b45020 100644
--- a/generator/internal/evacuation_lrp_processor.go
+++ b/generator/internal/evacuation_lrp_processor.go
@@ -8,7 +8,7 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/generator/internal/evacuation_lrp_processor_test.go b/generator/internal/evacuation_lrp_processor_test.go
index ad5f4af7..05d9cd46 100644
--- a/generator/internal/evacuation_lrp_processor_test.go
+++ b/generator/internal/evacuation_lrp_processor_test.go
@@ -9,13 +9,13 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
 	"code.cloudfoundry.org/rep/generator/internal"
 	"code.cloudfoundry.org/rep/generator/internal/fake_internal"
 	"code.cloudfoundry.org/routing-info/internalroutes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 )
diff --git a/generator/internal/fake_internal/fake_container_delegate.go b/generator/internal/fake_internal/fake_container_delegate.go
index 0532d2c4..f928c370 100644
--- a/generator/internal/fake_internal/fake_container_delegate.go
+++ b/generator/internal/fake_internal/fake_container_delegate.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep/generator/internal"
 )
 
diff --git a/generator/internal/fake_internal/fake_lrp_processor.go b/generator/internal/fake_internal/fake_lrp_processor.go
index 03747981..c9999b7c 100644
--- a/generator/internal/fake_internal/fake_lrp_processor.go
+++ b/generator/internal/fake_internal/fake_lrp_processor.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep/generator/internal"
 )
 
diff --git a/generator/internal/fake_internal/fake_task_processor.go b/generator/internal/fake_internal/fake_task_processor.go
index 12c486f5..218aaf58 100644
--- a/generator/internal/fake_internal/fake_task_processor.go
+++ b/generator/internal/fake_internal/fake_task_processor.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep/generator/internal"
 )
 
diff --git a/generator/internal/internal_suite_test.go b/generator/internal/internal_suite_test.go
index 78d70a55..c82b65ad 100644
--- a/generator/internal/internal_suite_test.go
+++ b/generator/internal/internal_suite_test.go
@@ -3,7 +3,7 @@ package internal_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/generator/internal/lrp_processor.go b/generator/internal/lrp_processor.go
index 596c9994..c30c925a 100644
--- a/generator/internal/lrp_processor.go
+++ b/generator/internal/lrp_processor.go
@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )
diff --git a/generator/internal/ordinary_lrp_processor.go b/generator/internal/ordinary_lrp_processor.go
index 3b7131b4..a1f88d65 100644
--- a/generator/internal/ordinary_lrp_processor.go
+++ b/generator/internal/ordinary_lrp_processor.go
@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/ecrhelper"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/generator/internal/ordinary_lrp_processor_test.go b/generator/internal/ordinary_lrp_processor_test.go
index 92ea95cf..86ddeeca 100644
--- a/generator/internal/ordinary_lrp_processor_test.go
+++ b/generator/internal/ordinary_lrp_processor_test.go
@@ -10,13 +10,13 @@ import (
 	"code.cloudfoundry.org/bbs/models/test/model_helpers"
 	fakeecrhelper "code.cloudfoundry.org/ecrhelper/fakes"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
 	"code.cloudfoundry.org/rep/generator/internal"
 	"code.cloudfoundry.org/rep/generator/internal/fake_internal"
 	"code.cloudfoundry.org/routing-info/internalroutes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 )
diff --git a/generator/internal/task_processor.go b/generator/internal/task_processor.go
index dd7f7cc3..b769bb91 100644
--- a/generator/internal/task_processor.go
+++ b/generator/internal/task_processor.go
@@ -5,7 +5,7 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/ecrhelper"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/generator/internal/task_processor_test.go b/generator/internal/task_processor_test.go
index c60861c1..561f897d 100644
--- a/generator/internal/task_processor_test.go
+++ b/generator/internal/task_processor_test.go
@@ -8,11 +8,11 @@ import (
 	"code.cloudfoundry.org/bbs/models/test/model_helpers"
 	fakeecrhelper "code.cloudfoundry.org/ecrhelper/fakes"
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/generator/internal"
 	"code.cloudfoundry.org/rep/generator/internal/fake_internal"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/generator/operation.go b/generator/operation.go
index 10d85398..5336dcfc 100644
--- a/generator/operation.go
+++ b/generator/operation.go
@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/bbs"
 	"code.cloudfoundry.org/bbs/models"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/generator/internal"
 )
diff --git a/generator/operation_test.go b/generator/operation_test.go
index c842e6c5..7c793fc9 100644
--- a/generator/operation_test.go
+++ b/generator/operation_test.go
@@ -9,7 +9,7 @@ import (
 	"code.cloudfoundry.org/rep/generator"
 	"code.cloudfoundry.org/rep/generator/internal"
 	"code.cloudfoundry.org/rep/generator/internal/fake_internal"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 )
diff --git a/handlers/cancel_task_handler.go b/handlers/cancel_task_handler.go
index 8243eae1..e9d1b4ae 100644
--- a/handlers/cancel_task_handler.go
+++ b/handlers/cancel_task_handler.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 )
 
diff --git a/handlers/cancel_task_handler_test.go b/handlers/cancel_task_handler_test.go
index 869f252f..8d77eabb 100644
--- a/handlers/cancel_task_handler_test.go
+++ b/handlers/cancel_task_handler_test.go
@@ -7,7 +7,7 @@ import (
 	"code.cloudfoundry.org/executor"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/container_metrics_handler.go b/handlers/container_metrics_handler.go
index 65913433..99bf4df9 100644
--- a/handlers/container_metrics_handler.go
+++ b/handlers/container_metrics_handler.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 )
diff --git a/handlers/container_metrics_handler_test.go b/handlers/container_metrics_handler_test.go
index 4bf64073..e1b156c5 100644
--- a/handlers/container_metrics_handler_test.go
+++ b/handlers/container_metrics_handler_test.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/evacuation_handler.go b/handlers/evacuation_handler.go
index 0c34287f..d042c0c4 100644
--- a/handlers/evacuation_handler.go
+++ b/handlers/evacuation_handler.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 )
diff --git a/handlers/evacuation_handler_test.go b/handlers/evacuation_handler_test.go
index db2d224f..54611b2b 100644
--- a/handlers/evacuation_handler_test.go
+++ b/handlers/evacuation_handler_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/handlers.go b/handlers/handlers.go
index 2221ccf5..53d8daa2 100644
--- a/handlers/handlers.go
+++ b/handlers/handlers.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
diff --git a/handlers/handlers_suite_test.go b/handlers/handlers_suite_test.go
index 2ae8411e..9a59cba0 100644
--- a/handlers/handlers_suite_test.go
+++ b/handlers/handlers_suite_test.go
@@ -10,14 +10,14 @@ import (
 	"testing"
 
 	executorfakes "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/locket/metrics/helpers/helpersfakes"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep/auctioncellrepfakes"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
 	"code.cloudfoundry.org/rep/handlers"
 	"code.cloudfoundry.org/rep/handlers/handlersfakes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/tedsuo/rata"
 )
diff --git a/handlers/handlers_test.go b/handlers/handlers_test.go
index d917c6c0..b67fb41c 100644
--- a/handlers/handlers_test.go
+++ b/handlers/handlers_test.go
@@ -8,7 +8,7 @@ import (
 
 	executorfakes "code.cloudfoundry.org/executor/fakes"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/tedsuo/rata"
 )
diff --git a/handlers/handlersfakes/fake_metric_collector.go b/handlers/handlersfakes/fake_metric_collector.go
index 15238dc5..d2f383a3 100644
--- a/handlers/handlersfakes/fake_metric_collector.go
+++ b/handlers/handlersfakes/fake_metric_collector.go
@@ -4,7 +4,7 @@ package handlersfakes
 import (
 	"sync"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/handlers"
 )
diff --git a/handlers/log_wrap_test.go b/handlers/log_wrap_test.go
index 1316f74b..20810b86 100644
--- a/handlers/log_wrap_test.go
+++ b/handlers/log_wrap_test.go
@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 )
diff --git a/handlers/perform_handler.go b/handlers/perform_handler.go
index 6521d088..400f5dd8 100644
--- a/handlers/perform_handler.go
+++ b/handlers/perform_handler.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
diff --git a/handlers/perform_handler_test.go b/handlers/perform_handler_test.go
index 6162602a..9eb95a53 100644
--- a/handlers/perform_handler_test.go
+++ b/handlers/perform_handler_test.go
@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/ping_handler.go b/handlers/ping_handler.go
index 196110ae..dcac625d 100644
--- a/handlers/ping_handler.go
+++ b/handlers/ping_handler.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"net/http"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 )
 
diff --git a/handlers/ping_handler_test.go b/handlers/ping_handler_test.go
index 755c1895..f291b89c 100644
--- a/handlers/ping_handler_test.go
+++ b/handlers/ping_handler_test.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/reset_handler.go b/handlers/reset_handler.go
index 1800375f..1f144f3c 100644
--- a/handlers/reset_handler.go
+++ b/handlers/reset_handler.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep/auctioncellrep"
 )
diff --git a/handlers/reset_handler_test.go b/handlers/reset_handler_test.go
index 9a4bf098..be9f491d 100644
--- a/handlers/reset_handler_test.go
+++ b/handlers/reset_handler_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/state_handler.go b/handlers/state_handler.go
index c132447b..8a6bacfd 100644
--- a/handlers/state_handler.go
+++ b/handlers/state_handler.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/auctioncellrep"
diff --git a/handlers/state_handler_test.go b/handlers/state_handler_test.go
index 19599e15..7a91fc34 100644
--- a/handlers/state_handler_test.go
+++ b/handlers/state_handler_test.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"time"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/stop_lrp_handler.go b/handlers/stop_lrp_handler.go
index def336cd..57fcd080 100644
--- a/handlers/stop_lrp_handler.go
+++ b/handlers/stop_lrp_handler.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 )
diff --git a/handlers/stop_lrp_handler_test.go b/handlers/stop_lrp_handler_test.go
index e4a01521..27b64be9 100644
--- a/handlers/stop_lrp_handler_test.go
+++ b/handlers/stop_lrp_handler_test.go
@@ -10,11 +10,11 @@ import (
 	"time"
 
 	executorfakes "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep/handlers"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/handlers/update_lrp_handler.go b/handlers/update_lrp_handler.go
index be4d556b..0228c812 100644
--- a/handlers/update_lrp_handler.go
+++ b/handlers/update_lrp_handler.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/executor"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/locket/metrics/helpers"
 	"code.cloudfoundry.org/rep"
 )
diff --git a/handlers/update_lrp_handler_test.go b/handlers/update_lrp_handler_test.go
index 1513c70a..598bc300 100644
--- a/handlers/update_lrp_handler_test.go
+++ b/handlers/update_lrp_handler_test.go
@@ -12,13 +12,13 @@ import (
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/executor"
 	executorfakes "code.cloudfoundry.org/executor/fakes"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/handlers"
 	"code.cloudfoundry.org/routing-info/internalroutes"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/harmonizer/bulker.go b/harmonizer/bulker.go
index 120d88b5..6c4d648c 100644
--- a/harmonizer/bulker.go
+++ b/harmonizer/bulker.go
@@ -6,7 +6,7 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 	"code.cloudfoundry.org/rep/generator"
diff --git a/harmonizer/bulker_test.go b/harmonizer/bulker_test.go
index 3f593934..8a4d503c 100644
--- a/harmonizer/bulker_test.go
+++ b/harmonizer/bulker_test.go
@@ -7,14 +7,14 @@ import (
 
 	"code.cloudfoundry.org/clock/fakeclock"
 	mfakes "code.cloudfoundry.org/diego-logging-client/testhelpers"
-	"code.cloudfoundry.org/lager"
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/operationq/fake_operationq"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context"
 	"code.cloudfoundry.org/rep/generator/fake_generator"
 	"code.cloudfoundry.org/rep/harmonizer"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/tedsuo/ifrit"
diff --git a/harmonizer/event_consumer.go b/harmonizer/event_consumer.go
index 7fe65913..48111a20 100644
--- a/harmonizer/event_consumer.go
+++ b/harmonizer/event_consumer.go
@@ -3,7 +3,7 @@ package harmonizer
 import (
 	"os"
 
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/rep/generator"
 )
@@ -55,6 +55,4 @@ func (consumer *EventConsumer) Run(signals <-chan os.Signal, ready chan<- struct
 			return nil
 		}
 	}
-
-	return nil
 }
diff --git a/harmonizer/event_consumer_test.go b/harmonizer/event_consumer_test.go
index 4553bf66..7ad41ab0 100644
--- a/harmonizer/event_consumer_test.go
+++ b/harmonizer/event_consumer_test.go
@@ -4,12 +4,12 @@ import (
 	"errors"
 	"os"
 
-	"code.cloudfoundry.org/lager/lagertest"
+	"code.cloudfoundry.org/lager/v3/lagertest"
 	"code.cloudfoundry.org/operationq"
 	"code.cloudfoundry.org/operationq/fake_operationq"
 	"code.cloudfoundry.org/rep/generator/fake_generator"
 	"code.cloudfoundry.org/rep/harmonizer"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/tedsuo/ifrit"
 )
diff --git a/harmonizer/harmonizer_suite_test.go b/harmonizer/harmonizer_suite_test.go
index 1a5491b7..644947bd 100644
--- a/harmonizer/harmonizer_suite_test.go
+++ b/harmonizer/harmonizer_suite_test.go
@@ -1,7 +1,7 @@
 package harmonizer_test
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	"testing"
diff --git a/rep_suite_test.go b/rep_suite_test.go
index 6627e05e..e9f8b122 100644
--- a/rep_suite_test.go
+++ b/rep_suite_test.go
@@ -9,7 +9,7 @@ import (
 	"code.cloudfoundry.org/rep"
 	"code.cloudfoundry.org/rep/evacuation/evacuation_context/fake_evacuation_context"
 	"code.cloudfoundry.org/rep/repfakes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/repfakes/fake_client.go b/repfakes/fake_client.go
index 46f9b106..8fbcbb7c 100644
--- a/repfakes/fake_client.go
+++ b/repfakes/fake_client.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/bbs/models"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/repfakes/fake_sim_client.go b/repfakes/fake_sim_client.go
index 210e656e..b324d439 100644
--- a/repfakes/fake_sim_client.go
+++ b/repfakes/fake_sim_client.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"code.cloudfoundry.org/bbs/models"
-	"code.cloudfoundry.org/lager"
+	"code.cloudfoundry.org/lager/v3"
 	"code.cloudfoundry.org/rep"
 )
 
diff --git a/resources_test.go b/resources_test.go
index 1fa2be2f..913e7d02 100644
--- a/resources_test.go
+++ b/resources_test.go
@@ -5,7 +5,7 @@ import (
 
 	"code.cloudfoundry.org/bbs/models"
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/rootfs_providers.go b/rootfs_providers.go
index 283922ba..f85269cf 100644
--- a/rootfs_providers.go
+++ b/rootfs_providers.go
@@ -128,7 +128,7 @@ func (provider FixedSetRootFSProvider) MarshalJSON() ([]byte, error) {
 
 func (provider *FixedSetRootFSProvider) UnmarshalJSON(payload []byte) error {
 	type fixed struct {
-		Set StringSet `json"set"`
+		Set StringSet `json:"set"`
 	}
 
 	var f fixed
diff --git a/rootfs_providers_test.go b/rootfs_providers_test.go
index 515860e1..56ad3578 100644
--- a/rootfs_providers_test.go
+++ b/rootfs_providers_test.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 
 	"code.cloudfoundry.org/rep"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )