diff --git a/deploy/overlays/development/services/virtual-vehicle/deployment.yaml b/deploy/overlays/development/services/virtual-vehicle/deployment.yaml
index 69dcd53..5970d0f 100644
--- a/deploy/overlays/development/services/virtual-vehicle/deployment.yaml
+++ b/deploy/overlays/development/services/virtual-vehicle/deployment.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: virtual-vehicle
-          image: localhost:32000/virtual-vehicle:latest
+          image: localhost:32000/virtual-vehicle:v2
           imagePullPolicy: IfNotPresent
           env:
             - name: MANUFACTURER_URL
diff --git a/services/virtual-vehicle/main.go b/services/virtual-vehicle/main.go
index 96c6cb1..26dbe84 100644
--- a/services/virtual-vehicle/main.go
+++ b/services/virtual-vehicle/main.go
@@ -38,19 +38,23 @@ func main() {
 	logger.Info().Str("vin", vin).Msg("Generated VIN")
 
 	// Register vehicle and get certificates
+	logger.Info().Str("url", manufacturerURL).Msg("Registering with manufacturer")
 	cert, key, err := registerVehicle(vin)
 	if err != nil {
-		logger.Fatal().Err(err).Msg("Failed to register vehicle")
+		logger.Error().Err(err).Msg("Failed to register vehicle")
+		os.Exit(1)
 	}
 	logger.Info().Str("vin", vin).Msg("Vehicle registered successfully")
 
 	// Load TLS certificate
 	tlsCert, err := tls.X509KeyPair([]byte(cert), []byte(key))
 	if err != nil {
-		logger.Fatal().Err(err).Msg("Failed to load TLS certificate")
+		logger.Error().Err(err).Msg("Failed to load TLS certificate")
+		os.Exit(1)
 	}
 
 	// Connect to gateway
+	logger.Info().Str("url", gatewayWSURL).Msg("Connecting to gateway")
 	conn, err := connectToGateway(vin, tlsCert)
 	if err != nil {
 		logger.Fatal().Err(err).Msg("Failed to connect to gateway")