Unintentionally created duplicate functions that can't be used

Signed-off-by: Dan Finneran <dan@thebsdbox.co.uk>
2026-09-21 00:23:59 +08:00 · 2025-08-12 12:17:20 +00:00
88 changed files with 1220 additions and 5406 deletions
--- a/.github/workflows/anchore-syft.yml
+++ b/.github/workflows/anchore-syft.yml
@@ -22,10 +22,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          ref: ${{ github.ref_name }}
      - name: Anchore SBOM Action
-        uses: anchore/sbom-action@v0.20.10
+        uses: anchore/sbom-action@v0.20.4
        with:
          format: cyclonedx-json
--- a/.github/workflows/ci-pull-request.yaml
+++ b/.github/workflows/ci-pull-request.yaml
@@ -9,16 +9,14 @@ jobs:
      matrix:
        mode: ["arp", "rt", "bgp"]
      fail-fast: true
+      max-parallel: 1
    steps:
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d-%H-%M')"
      - name: Ensure fs wont cause issues
        run: sudo sysctl fs.inotify.max_user_instances=8192 &&  sudo sysctl fs.inotify.max_user_watches=524288
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
      - name: Build image locally
@@ -26,46 +24,28 @@ jobs:
      - name: Run Manifest generation tests
        run: make manifest-test
      - name: Run ARP mode tests v1.29.0 onwards
-        run: E2E_KEEP_LOGS=true make e2e-tests129-arp
+        run: make e2e-tests129-arp
        if: matrix.mode== 'arp'
      - name: Run RT mode tests v1.29.0 onwards
-        run: E2E_KEEP_LOGS=true make e2e-tests129-rt
+        run: make e2e-tests129-rt
        if: matrix.mode== 'rt'
      - name: Get GoBGP binaries
        run: make get-gobgp
        if: matrix.mode== 'bgp'
      - name: Run BGP mode tests v1.29.0 onwards
-        run: sudo -E PATH=$PATH DOCKER_API_VERSION=1.48 E2E_KEEP_LOGS=true make e2e-tests129-bgp
+        run: sudo -E PATH=$PATH DOCKER_API_VERSION=1.48 make e2e-tests129-bgp
        if: matrix.mode== 'bgp'
-      - name: Change log directory permissions
-        run: sudo chmod -R 755 /tmp/kube-vip-test-${{ matrix.mode }}*
-        if: matrix.mode== 'bgp' && always()
-      - name: Save logs
-        uses: actions/upload-artifact@v5
-        with:
-          name: e2e-test-logs-${{ matrix.mode }}-${{ steps.date.outputs.date }}
-          path: /tmp/kube-vip-test-${{ matrix.mode }}*
-        if: always()
  service-e2e-tests:
    runs-on: ubuntu-latest
    name: E2E service tests
    steps:
-      - name: Get current date
-        id: date
-        run: echo "::set-output name=date::$(date +'%Y-%m-%d-%H-%M')"
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
      - name: Build image with iptables
        run: make dockerx86ActionIPTables
      - name: Run tests
-        run: DOCKERTAG=action E2E_KEEP_LOGS=true make service-tests
-      - name: Save logs
-        uses: actions/upload-artifact@v5
-        with:
-          name: services-test-logs-${{ steps.date.outputs.date }}
-          path: /tmp/kube-vip-service-tests*
-        if: always()
+        run: DOCKERTAG=action make service-tests
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,9 +12,9 @@ jobs:
      - name: Install golangci-lint
        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
      - name: All checks
@@ -24,9 +24,9 @@ jobs:
    name: Unit tests
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
      - name: Run tests
@@ -36,9 +36,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version-file: go.mod
      - name: Run tests
@@ -48,7 +48,7 @@ jobs:
    name: Image vulnerability scan
    steps:
      - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Build image with iptables
        run: make dockerx86ActionIPTables
      - name: Run Trivy vulnerability scanner
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,16 +38,16 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
      
    - name: Install Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
      with:
        go-version-file: go.mod
        
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v3

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v3
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
@@ -28,7 +28,7 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Generate Metadata
-        uses: docker/metadata-action@v5.9.0
+        uses: docker/metadata-action@v5.7.0
        id: metadata
        with:
          labels: |
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,33 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-### Added
- SIGUSR1 signal handler for runtime configuration dumps (#1301)
-  - Send SIGUSR1 to kube-vip process to dump current configuration to stdout
-  - Configuration dump includes:
-    - Basic configuration (VIP, interface, port, namespace settings)
-    - BGP configuration (enabled status, AS number, router ID, peers)
-    - ARP/NDP configuration (enabled status, broadcast rate)
-    - Services configuration (enabled status, load balancer settings)
-    - Network interfaces status
-    - Leader election configuration (type, lease details)
-    - Runtime statistics (load balancer, Prometheus, health check settings)
-  - Output format: Human-readable plaintext via fmt.Printf()
-  - Thread-safe implementation using mutex protection
-  - Non-disruptive: Process continues running after configuration dump
-  - Added comprehensive unit tests for all dump methods
-  - Added E2E tests for signal handling
-
-### Changed
- Updated signal handlers in manager_arp.go, manager_bgp.go, manager_wireguard.go, and manager_table.go to use switch statement pattern for handling multiple signals (SIGUSR1, SIGINT, SIGTERM)
-
-## [v1.0.1] - Previous Release
-
-### Previous changes
- See git history for changes prior to CHANGELOG.md introduction
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental

-FROM golang:1.25.4-alpine3.22 as dev
+FROM golang:1.24.5-alpine3.22 as dev
 RUN apk add --no-cache git ca-certificates make
 RUN adduser -D appuser
 COPY . /src/
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:experimental

-FROM golang:1.25.4-alpine3.22 as dev
+FROM golang:1.24.5-alpine3.22 as dev
 RUN apk add --no-cache git make
 RUN adduser -D appuser
 COPY . /src/
@@ -11,7 +11,7 @@ RUN --mount=type=cache,sharing=locked,id=gomod,target=/go/pkg/mod/cache \
    --mount=type=cache,sharing=locked,id=goroot,target=/root/.cache/go-build \
    CGO_ENABLED=0 GOOS=linux make build

-FROM alpine:3.22.2
+FROM alpine:3.22.1
 # Update pkgs and add iptables
 RUN apk upgrade && \
    apk add --no-cache iptables iptables-legacy
--- a/34
+++ b/34
@@ -5,7 +5,7 @@ TARGET := kube-vip
 .DEFAULT_GOAL := $(TARGET)

 # These will be provided to the target
-VERSION := v1.0.2
+VERSION := v1.0.0

 BUILD := `git rev-parse HEAD`

@@ -15,7 +15,7 @@ TARGETOS=linux
 # Use linker flags to provide version/build settings to the target
 LDFLAGS=-ldflags "-s -w -X=main.Version=$(VERSION) -X=main.Build=$(BUILD) -extldflags -static"
 DOCKERTAG ?= $(VERSION)
-REPOSITORY ?= docker.io/plndr
+REPOSITORY ?= plndr

 .PHONY: all build clean install uninstall simplify check run e2e-tests

@@ -109,22 +109,22 @@ run: install
 manifests:
 	@make build
 	@mkdir -p ./docs/manifests/$(VERSION)/
-	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services > ./docs/manifests/$(VERSION)/kube-vip-arp.yaml
-	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --enableLoadBalancer > ./docs/manifests/$(VERSION)/kube-vip-arp-lb.yaml
-	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --bgp --controlplane --services > ./docs/manifests/$(VERSION)/kube-vip-bgp.yaml
-	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-arp-ds.yaml
-	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --inCluster --enableLoadBalancer > ./docs/manifests/$(VERSION)/kube-vip-arp-ds-lb.yaml
-	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --bgp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-bgp-ds.yaml
-	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --bgp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-bgp-em-ds.yaml
+	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services > ./docs/manifests/$(VERSION)/kube-vip-arp.yaml
+	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --enableLoadBalancer > ./docs/manifests/$(VERSION)/kube-vip-arp-lb.yaml
+	@./kube-vip manifest pod --interface eth0 --vip 192.168.0.1 --bgp --controlplane --services > ./docs/manifests/$(VERSION)/kube-vip-bgp.yaml
+	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-arp-ds.yaml
+	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --inCluster --enableLoadBalancer > ./docs/manifests/$(VERSION)/kube-vip-arp-ds-lb.yaml
+	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --bgp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-bgp-ds.yaml
+	@./kube-vip manifest daemonset --interface eth0 --vip 192.168.0.1 --bgp --leaderElection --controlplane --services --inCluster > ./docs/manifests/$(VERSION)/kube-vip-bgp-em-ds.yaml
 	@-rm ./kube-vip

 manifest-test: 
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --enableLoadBalancer
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --bgp --controlplane --services
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --inCluster
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --leaderElection --controlplane --services --inCluster --enableLoadBalancer
-	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --bgp --leaderElection --controlplane --services --inCluster
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --enableLoadBalancer
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest pod --interface eth0 --vip 192.168.0.1 --bgp --controlplane --services 
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --inCluster
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --arp --leaderElection --controlplane --services --inCluster --enableLoadBalancer
+	docker run $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --interface eth0 --vip 192.168.0.1 --bgp --leaderElection --controlplane --services --inCluster

 unit-tests:
 	go test ./...
@@ -166,10 +166,10 @@ kind-quick:
 	kubectl create configmap --namespace kube-system kubevip --from-literal range-global=172.18.100.10-172.18.100.30
 	kubectl apply -f https://raw.githubusercontent.com/kube-vip/kube-vip-cloud-provider/main/manifest/kube-vip-cloud-controller.yaml
 	kind load docker-image --name kube-vip $(REPOSITORY)/$(TARGET):$(DOCKERTAG)
-	docker run --network host --rm $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --services --inCluster --image "$(REPOSITORY)/$(TARGET):$(DOCKERTAG)" --arp --servicesElection --interface  eth0 | kubectl apply -f -
+	docker run --network host --rm $(REPOSITORY)/$(TARGET):$(DOCKERTAG) manifest daemonset --services --inCluster --arp --servicesElection --interface  eth0 | kubectl apply -f -

 kind-reload:
-	kind load docker-image $(REPOSITORY)/$(TARGET):$(DOCKERTAG) --name services
+	kind load docker-image $(REPOSITORY)/$(TARGET):$(DOCKERTAG) --name kube-vip
 	kubectl rollout restart -n kube-system daemonset/kube-vip-ds

 get-gobgp:
--- a/cmd/kube-vip-kubeadm.go
+++ b/cmd/kube-vip-kubeadm.go
@@ -58,14 +58,14 @@ var kubeKubeadmInit = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("generating VIPSubnet", "err", err)
 				return
 			}
 		}

-		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, image, Release.Version, inCluster)
+		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, Release.Version, inCluster)
 		fmt.Println(cfg) // output manifest to stdout
 	},
 }
@@ -103,14 +103,14 @@ var kubeKubeadmJoin = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("generating VIPSubnet", "err", err)
 				return
 			}
 		}

-		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, image, Release.Version, inCluster)
+		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, Release.Version, inCluster)
 		fmt.Println(cfg) // output manifest to stdout
 	},
 }
--- a/cmd/kube-vip-manifests.go
+++ b/cmd/kube-vip-manifests.go
@@ -19,7 +19,6 @@ var taint, role, rolebinding bool

 func init() {
 	kubeManifest.PersistentFlags().BoolVar(&inCluster, "inCluster", false, "Use the incluster token to authenticate to Kubernetes")
-	kubeManifest.PersistentFlags().StringVar(&image, "image", "ghcr.io/kube-vip/kube-vip", "Define a hardcoded image with or without tag for the manifest")
 	kubeManifestDaemon.PersistentFlags().BoolVar(&taint, "taint", false, "Taint the manifest for only running on control planes")
 	kubeManifestRbac.PersistentFlags().BoolVar(&role, "role", false, "Generate only a Role inside the serviceNamespace access")
 	kubeManifestRbac.PersistentFlags().BoolVar(&rolebinding, "rolebinding", false, "Generate only a RoleBinding for namespaced access")
@@ -60,14 +59,14 @@ var kubeManifestPod = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("config parse", "err", err)
 				return
 			}
 		}

-		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, image, Release.Version, inCluster)
+		cfg := kubevip.GeneratePodManifestFromConfig(&initConfig, Release.Version, inCluster)
 		fmt.Println(cfg) // output manifest to stdout
 	},
 }
@@ -93,14 +92,14 @@ var kubeManifestDaemon = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("config parse", "err", err)
 				return
 			}
 		}

-		cfg := kubevip.GenerateDaemonsetManifestFromConfig(&initConfig, image, Release.Version, inCluster, taint)
+		cfg := kubevip.GenerateDaemonsetManifestFromConfig(&initConfig, Release.Version, inCluster, taint)
 		fmt.Println(cfg) // output manifest to stdout
 	},
 }
@@ -127,7 +126,7 @@ var kubeManifestRbac = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("generating VIPSubnet", "err", err)
 				return
--- a/cmd/kube-vip.go
+++ b/cmd/kube-vip.go
@@ -6,7 +6,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"slices"
 	"strings"
 	"time"

@@ -20,13 +19,9 @@ import (

 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/manager"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 )

-// Is an option to set the image
-var image string
-
 // Is kube-vip running within cluster
 var inCluster bool

@@ -67,7 +62,6 @@ func init() {
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableARP, "arp", false, "Enable Arp for VIP changes")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableWireguard, "wireguard", false, "Enable Wireguard for services VIPs")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableRoutingTable, "table", false, "Enable Routing Table for services VIPs")
-	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.PreserveVIPOnLeadershipLoss, "preserveVipOnLeadershipLoss", false, "Preserve ARP VIP addresses on interface when leadership is lost (default: false for backward compatibility)")

 	// LoadBalancer flags
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableLoadBalancer, "enableLoadBalancer", false, "enable loadbalancing on the VIP with IPVS")
@@ -126,11 +120,11 @@ func init() {

 	// Extended behaviour flags
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableServicesElection, "servicesElection", false, "Enable leader election per kubernetes service")
-	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.LoadBalancerClassOnly, "lbClassOnly", false, fmt.Sprintf("Enable load balancing only for services with LoadBalancerClass %q", kubevip.LBClassName))
-	kubeVipCmd.PersistentFlags().StringVar(&initConfig.LoadBalancerClassName, "lbClassName", kubevip.LBClassName, fmt.Sprintf("Name of load balancer class for kube-VIP, defaults to %q", kubevip.LBClassName))
+	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.LoadBalancerClassOnly, "lbClassOnly", false, "Enable load balancing only for services with LoadBalancerClass \"kube-vip.io/kube-vip-class\"")
+	kubeVipCmd.PersistentFlags().StringVar(&initConfig.LoadBalancerClassName, "lbClassName", "kube-vip.io/kube-vip-class", "Name of load balancer class for kube-VIP, defaults to \"kube-vip.io/kube-vip-class\"")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.LoadBalancerClassLegacyHandling, "lbClassNameLegacyHandling", true, "Use legacy LoadBalancer class name handling (e.g. accepting services both with empty and non-empty class)")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableServiceSecurity, "onlyAllowTrafficServicePorts", false, "Only allow traffic to service ports, others will be dropped, defaults to false")
-	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableNodeLabeling, "enableNodeLabeling", false, fmt.Sprintf("Enable leader node labeling with %q, defaults to false", kubevip.HasIP))
+	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.EnableNodeLabeling, "enableNodeLabeling", false, "Enable leader node labeling with \"kube-vip.io/has-ip=<VIP address>\", defaults to false")
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.ServicesLeaseName, "servicesLeaseName", "plndr-svcs-lock", "Name of the lease that is used for leader election for services (in arp mode)")
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.DNSMode, "dnsMode", "first", "Name of the mode that DNS lookup will be performed (first, ipv4, ipv6, dual)")
 	kubeVipCmd.PersistentFlags().BoolVar(&initConfig.DisableServiceUpdates, "disableServiceUpdates", false, "If true, kube-vip will process services as usual, but will not update service's Status.LoadBalancer.Ingress slice")
@@ -150,9 +144,6 @@ func init() {
 	// Kubernetes client specific flags
 	kubeVipCmd.PersistentFlags().StringVar(&initConfig.K8sConfigFile, "k8sConfigPath", "/etc/kubernetes/admin.conf", "Path to the configuration file used with the Kubernetes client")

-	// Configuration file flag
-	kubeVipCmd.PersistentFlags().StringVar(&initConfig.ConfigFile, "config-file", "", "Path to a JSON/YAML configuration file to load settings from")
-
 	kubeVipCmd.AddCommand(kubeKubeadm)
 	kubeVipCmd.AddCommand(kubeManifest)
 	kubeVipCmd.AddCommand(kubeVipManager)
@@ -195,16 +186,7 @@ var kubeVipService = &cobra.Command{
 	Short: "Start the Virtual IP / Load balancer as a service within a Kubernetes cluster",
 	Run: func(cmd *cobra.Command, args []string) { //nolint TODO

-		// Load configuration from file if specified (lowest priority)
-		if initConfig.ConfigFile != "" {
-			err := kubevip.MergeConfigFromFile(&initConfig, initConfig.ConfigFile)
-			if err != nil {
-				log.Error("loading config file", "err", err)
-				return
-			}
-		}
-
-		// parse environment variables, these will overwrite anything loaded from config file
+		// parse environment variables, these will overwrite anything loaded or flags
 		err := kubevip.ParseEnvironment(&initConfig)
 		if err != nil {
 			log.Error("parsing env", "err", err)
@@ -232,7 +214,7 @@ var kubeVipService = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("generating CIDR", "err", err)
 				return
@@ -259,16 +241,7 @@ var kubeVipManager = &cobra.Command{
 	Use:   "manager",
 	Short: "Start the kube-vip manager",
 	Run: func(cmd *cobra.Command, args []string) { //nolint TODO
-		// Load configuration from file if specified (lowest priority)
-		if initConfig.ConfigFile != "" {
-			err := kubevip.MergeConfigFromFile(&initConfig, initConfig.ConfigFile)
-			if err != nil {
-				log.Error("loading config file", "err", err)
-				return
-			}
-		}
-
-		// parse environment variables, these will overwrite anything loaded from config file
+		// parse environment variables, these will overwrite anything loaded or flags
 		err := kubevip.ParseEnvironment(&initConfig)
 		if err != nil {
 			log.Error("parsing environment", "err", err)
@@ -285,7 +258,7 @@ var kubeVipManager = &cobra.Command{

 		// Ensure there is an address to generate the CIDR from
 		if initConfig.VIPSubnet == "" && initConfig.Address != "" {
-			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address, initConfig.DNSMode)
+			initConfig.VIPSubnet, err = GenerateCidrRange(initConfig.Address)
 			if err != nil {
 				log.Error("No interface is specified for kube-vip to bind to")
 				return
@@ -475,37 +448,26 @@ func servePrometheusHTTPServer(ctx context.Context, config PrometheusHTTPServerC
 	}
 }

-func GenerateCidrRange(address string, dnsMode string) (string, error) {
+func GenerateCidrRange(address string) (string, error) {
 	var cidrs []string

 	addresses := strings.Split(address, ",")
 	for _, a := range addresses {
 		ip := net.ParseIP(a)
 		if ip == nil {
-			// we probably are a DNS name
-			ips, err := utils.LookupHost(a, dnsMode)
+			ips, err := net.LookupIP(a)
 			if len(ips) == 0 || err != nil {
 				return "", fmt.Errorf("invalid IP address: %s from [%s], %v", a, address, err)
 			}
-			for _, addr := range ips {
-				ip = net.ParseIP(addr)
-				if ip.To4() != nil {
-					cidrs = append(cidrs, "32")
-				} else {
-					cidrs = append(cidrs, "128")
-				}
-			}
+			ip = ips[0]
+		}
+
+		if ip.To4() != nil {
+			cidrs = append(cidrs, "32")
 		} else {
-			if ip.To4() != nil {
-				cidrs = append(cidrs, "32")
-			} else {
-				cidrs = append(cidrs, "128")
-			}
+			cidrs = append(cidrs, "128")
 		}
 	}
-	// compact as DNS could have a lot of addresses
-	slices.Sort(cidrs)
-	cidrs = slices.Compact(cidrs)
-	slices.Reverse(cidrs)
+
 	return strings.Join(cidrs, ","), nil
 }
--- a/go.mod
+++ b/go.mod
@@ -5,52 +5,51 @@ go 1.24.4
 require (
 	github.com/cloudflare/ipvs v0.11.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
-	github.com/docker/docker v28.5.2+incompatible
+	github.com/docker/docker v28.3.3+incompatible
 	github.com/florianl/go-conntrack v0.4.0
 	github.com/google/go-cmp v0.7.0
-	github.com/google/go-containerregistry v0.20.6
 	github.com/google/nftables v0.3.0
-	github.com/gookit/slog v0.6.0
+	github.com/gookit/slog v0.5.8
 	github.com/huin/goupnp v1.3.0
 	github.com/insomniacslk/dhcp v0.0.0-20241224095048-b56fa0d5f25d
 	github.com/jpillora/backoff v1.0.0
 	github.com/mdlayher/ndp v1.1.0
-	github.com/onsi/ginkgo/v2 v2.27.2
-	github.com/onsi/gomega v1.38.2
+	github.com/onsi/ginkgo/v2 v2.23.4
+	github.com/onsi/gomega v1.37.0
 	github.com/osrg/gobgp/v3 v3.37.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.23.2
+	github.com/prometheus/client_golang v1.22.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.10.1
-	github.com/stretchr/testify v1.11.1
+	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.10.0
 	github.com/vishvananda/netlink v1.3.1
-	go.etcd.io/etcd/api/v3 v3.6.6
-	go.etcd.io/etcd/client/pkg/v3 v3.6.6
-	go.etcd.io/etcd/client/v3 v3.6.6
-	go.uber.org/zap v1.27.1
+	go.etcd.io/etcd/api/v3 v3.6.1
+	go.etcd.io/etcd/client/pkg/v3 v3.6.1
+	go.etcd.io/etcd/client/v3 v3.6.1
+	go.uber.org/zap v1.27.0
 	golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
-	golang.org/x/sync v0.18.0
-	golang.org/x/sys v0.38.0
+	golang.org/x/sync v0.15.0
+	golang.org/x/sys v0.33.0
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
-	google.golang.org/grpc v1.77.0
-	google.golang.org/protobuf v1.36.10
-	k8s.io/api v0.34.2
-	k8s.io/apimachinery v0.34.2
-	k8s.io/client-go v0.34.1
+	google.golang.org/grpc v1.73.0
+	google.golang.org/protobuf v1.36.6
+	k8s.io/api v0.33.3
+	k8s.io/apimachinery v0.33.3
+	k8s.io/client-go v0.33.3
 	k8s.io/klog/v2 v2.130.1
-	sigs.k8s.io/kind v0.30.0
-	sigs.k8s.io/yaml v1.6.0
+	sigs.k8s.io/kind v0.29.0
+	sigs.k8s.io/yaml v1.4.0
 )

 require (
 	al.essio.dev/pkg/shellescape v1.5.1 // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
-	github.com/Masterminds/semver/v3 v3.4.0 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
@@ -60,11 +59,11 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/eapache/channels v1.1.0 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -73,12 +72,12 @@ require (
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gookit/color v1.6.0 // indirect
-	github.com/gookit/goutil v0.7.1 // indirect
-	github.com/gookit/gsr v0.1.1 // indirect
+	github.com/gookit/color v1.5.4 // indirect
+	github.com/gookit/goutil v0.6.18 // indirect
+	github.com/gookit/gsr v0.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -95,10 +94,11 @@ require (
 	github.com/mdlayher/socket v0.5.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/atomicwriter v0.1.0 // indirect
 	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -106,16 +106,16 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.66.1 // indirect
-	github.com/prometheus/procfs v0.16.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.7.1 // indirect
-	github.com/spf13/pflag v1.0.9 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/spf13/viper v1.19.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tj/go-spin v1.1.0 // indirect
@@ -126,33 +126,33 @@ require (
 	github.com/xlab/c-for-go v1.3.0 // indirect
 	github.com/xlab/pkgconfig v0.0.0-20170226114623-cea12a0fd245 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/mod v0.29.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/oauth2 v0.32.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
+	golang.org/x/mod v0.25.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
 	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.38.0 // indirect
+	golang.org/x/tools v0.33.0 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
-	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
 	modernc.org/cc/v4 v4.24.4 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/opt v0.1.4 // indirect
@@ -161,5 +161,5 @@ require (
 	modernc.org/token v1.1.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -6,10 +6,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
-github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
@@ -41,8 +39,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
 github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
-github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
+github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -53,8 +51,8 @@ github.com/eapache/channels v1.1.0 h1:F1taHcn7/F0i8DYqKXJnyhJcVpp2kgFcNePxXtnyu4
 github.com/eapache/channels v1.1.0/go.mod h1:jMm2qB5Ubtg9zLd+inMZd2/NUvXgzmWXsDaLyQIGfH0=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
-github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
+github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -66,14 +64,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gkampitakis/ciinfo v0.3.2 h1:JcuOPk8ZU7nZQjdUhctuhQofk7BGHuIy0c9Ez8BNhXs=
-github.com/gkampitakis/ciinfo v0.3.2/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
-github.com/gkampitakis/go-diff v1.3.2 h1:Qyn0J9XJSDTgnsgHRdz9Zp24RaJeKMUHg2+PDZZdC4M=
-github.com/gkampitakis/go-diff v1.3.2/go.mod h1:LLgOrpqleQe26cte8s36HTWcTmMEur6OPYerdAAS9tk=
-github.com/gkampitakis/go-snaps v0.5.15 h1:amyJrvM1D33cPHwVrjo9jQxX8g/7E2wYdZ+01KS3zGE=
-github.com/gkampitakis/go-snaps v0.5.15/go.mod h1:HNpx/9GoKisdhw9AFOBT1N7DBs9DiHo/hGheFGBZ+mc=
+github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -89,15 +81,13 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
 github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
-github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
-github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
+github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -105,10 +95,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
-github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/nftables v0.3.0 h1:bkyZ0cbpVeMHXOrtlFc8ISmfVqq5gPJukoYieyVmITg=
 github.com/google/nftables v0.3.0/go.mod h1:BCp9FsrbF1Fn/Yu6CLUc9GGZFw/+hsxfluNXXmxBfRM=
@@ -118,16 +107,14 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaU
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0=
-github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E=
-github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA=
-github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs=
-github.com/gookit/goutil v0.7.1 h1:AaFJPN9mrdeYBv8HOybri26EHGCC34WJVT7jUStGJsI=
-github.com/gookit/goutil v0.7.1/go.mod h1:vJS9HXctYTCLtCsZot5L5xF+O1oR17cDYO9R0HxBmnU=
-github.com/gookit/gsr v0.1.1 h1:TaHD3M7qa6lcAf9D2J4mGNg+QjgDtD1bw7uctF8RXOM=
-github.com/gookit/gsr v0.1.1/go.mod h1:7wv4Y4WCnil8+DlDYHBjidzrEzfHhXEoFjEA0pPPWpI=
-github.com/gookit/slog v0.6.0 h1:KEQxOJxbTtk7oyqah6nJOEKjOdI0z5qoqkX7I6G65g4=
-github.com/gookit/slog v0.6.0/go.mod h1:hPlpNi/WIcGmkEjHzQTS7s5JZkHmmnGy9sYo6csa08s=
+github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
+github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
+github.com/gookit/goutil v0.6.18 h1:MUVj0G16flubWT8zYVicIuisUiHdgirPAkmnfD2kKgw=
+github.com/gookit/goutil v0.6.18/go.mod h1:AY/5sAwKe7Xck+mEbuxj0n/bc3qwrGNe3Oeulln7zBA=
+github.com/gookit/gsr v0.1.0 h1:0gadWaYGU4phMs0bma38t+Do5OZowRMEVlHv31p0Zig=
+github.com/gookit/gsr v0.1.0/go.mod h1:7wv4Y4WCnil8+DlDYHBjidzrEzfHhXEoFjEA0pPPWpI=
+github.com/gookit/slog v0.5.8 h1:XZCeHLQvvOZWcSUDZcqxXITsL9+d1ESsKZoASBmK1lI=
+github.com/gookit/slog v0.5.8/go.mod h1:s0ViFOY/IgUuT4MDPF0l9x5/npcciy8pL4xwWZadnoc=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -145,8 +132,6 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
-github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
-github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
@@ -166,6 +151,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -179,8 +165,6 @@ github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a
 github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
-github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
-github.com/maruel/natural v1.1.1/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43/go.mod h1:+t7E0lkKfbBsebllff1xdTmyJt8lH37niI6kwFk9OTo=
@@ -210,8 +194,6 @@ github.com/mdlayher/socket v0.0.0-20211007213009-516dcbdf0267/go.mod h1:nFZ1EtZY
 github.com/mdlayher/socket v0.1.0/go.mod h1:mYV5YIZAfHh4dzDVzI8x8tWLWCliuX8Mon5Awbj+qDs=
 github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
 github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
-github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
-github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -227,17 +209,16 @@ github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFL
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
-github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
-github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
-github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
-github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
+github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
+github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
+github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
+github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
@@ -252,28 +233,32 @@ github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNH
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
-github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
-github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
-github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
-github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
-github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
-github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
 github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -282,29 +267,23 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
 github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
 github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
 github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
-github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
-github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
-github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
-github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
 github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
-github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/tj/go-spin v1.1.0 h1:lhdWZsvImxvZ3q1C5OIB7d72DuOwP4O2NdBg9PyzNds=
 github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4=
 github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 h1:pyC9PaHYZFgEKFdlp3G8RaCKgVpHZnecvArXvPXcFkM=
@@ -326,55 +305,53 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.6.6 h1:mcaMp3+7JawWv69p6QShYWS8cIWUOl32bFLb6qf8pOQ=
-go.etcd.io/etcd/api/v3 v3.6.6/go.mod h1:f/om26iXl2wSkcTA1zGQv8reJRSLVdoEBsi4JdfMrx4=
-go.etcd.io/etcd/client/pkg/v3 v3.6.6 h1:uoqgzSOv2H9KlIF5O1Lsd8sW+eMLuV6wzE3q5GJGQNs=
-go.etcd.io/etcd/client/pkg/v3 v3.6.6/go.mod h1:YngfUVmvsvOJ2rRgStIyHsKtOt9SZI2aBJrZiWJhCbI=
-go.etcd.io/etcd/client/v3 v3.6.6 h1:G5z1wMf5B9SNexoxOHUGBaULurOZPIgGPsW6CN492ec=
-go.etcd.io/etcd/client/v3 v3.6.6/go.mod h1:36Qv6baQ07znPR3+n7t+Rk5VHEzVYPvFfGmfF4wBHV8=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.etcd.io/etcd/api/v3 v3.6.1 h1:yJ9WlDih9HT457QPuHt/TH/XtsdN2tubyxyQHSHPsEo=
+go.etcd.io/etcd/api/v3 v3.6.1/go.mod h1:lnfuqoGsXMlZdTJlact3IB56o3bWp1DIlXPIGKRArto=
+go.etcd.io/etcd/client/pkg/v3 v3.6.1 h1:CxDVv8ggphmamrXM4Of8aCC8QHzDM4tGcVr9p2BSoGk=
+go.etcd.io/etcd/client/pkg/v3 v3.6.1/go.mod h1:aTkCp+6ixcVTZmrJGa7/Mc5nMNs59PEgBbq+HCmWyMc=
+go.etcd.io/etcd/client/v3 v3.6.1 h1:KelkcizJGsskUXlsxjVrSmINvMMga0VWwFF0tSPGEP0=
+go.etcd.io/etcd/client/v3 v3.6.1/go.mod h1:fCbPUdjWNLfx1A6ATo9syUmFVxqHH9bCnPLBZmnLmMY=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
+go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
+go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 h1:bDMKF3RUSxshZ5OjOTi8rsHGaPKsAt76FaqgvIUySLc=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0/go.mod h1:dDT67G/IkA46Mr2l9Uj7HsQVwsjASyV9SjGofsiUZDA=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
+go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E=
+go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI=
+go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg=
+go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
+go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
+go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
+go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
 go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
 go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
-go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
-go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
-go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
 golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
 golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
-golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
+golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -395,20 +372,22 @@ golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
-golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
-golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
+golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -435,16 +414,16 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
 golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -453,8 +432,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
-golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -463,16 +442,14 @@ golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uI
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
-gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
-gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
-google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
-google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
-google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
-google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 h1:oWVWY3NzT7KJppx2UKhKmzPq4SRe0LdCijVRwvGeikY=
+google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822/go.mod h1:h3c4v36UTKzUiuaOKQ6gr3S+0hovBtUrXzTG/i3+XEc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
+google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
+google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -491,18 +468,18 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
 honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
 honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
-k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
-k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
-k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
-k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
-k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
-k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
+k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
+k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
+k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
+k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
+k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
+k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
-k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
-k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
-k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
+k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
+k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
 modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
 modernc.org/ccorpus2 v1.5.2 h1:Ui+4tc58mf/W+2arcYCJR903y3zl3ecsI7Fpaaqozyw=
@@ -521,11 +498,12 @@ pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
 pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
-sigs.k8s.io/kind v0.30.0 h1:2Xi1KFEfSMm0XDcvKnUt15ZfgRPCT0OnCBbpgh8DztY=
-sigs.k8s.io/kind v0.30.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
+sigs.k8s.io/kind v0.29.0 h1:3TpCsyh908IkXXpcSnsMjWdwdWjIl7o9IMZImZCWFnI=
+sigs.k8s.io/kind v0.29.0/go.mod h1:ldWQisw2NYyM6k64o/tkZng/1qQW7OlzcN5a8geJX3o=
+sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
-sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
-sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
+sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
--- a/pkg/arp/arp.go
+++ b/pkg/arp/arp.go
@@ -2,18 +2,16 @@ package arp

 import (
 	"context"
-	"fmt"
 	log "log/slog"
 	"sync"
 	"time"

 	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 )

 type Manager struct {
-	instances sync.Map
+	instances map[string]*Instance
 	config    *kubevip.Config
 }

@@ -26,7 +24,8 @@ type Instance struct {

 func NewManager(config *kubevip.Config) *Manager {
 	return &Manager{
-		config: config,
+		instances: make(map[string]*Instance),
+		config:    config,
 	}
 }

@@ -43,14 +42,10 @@ func (i *Instance) Name() string {
 }

 func (m *Manager) Insert(instance *Instance) {
-	i, err := m.get(instance.Name())
-	if err != nil {
-		log.Error("[ARP manager] unable to insert instance", "err", err)
-		return
-	}
-	if i == nil {
-		log.Info("[ARP manager] inserting ARP/NDP instance", "name", instance.Name())
-		m.instances.Store(instance.Name(), instance)
+	i, ok := m.instances[instance.Name()]
+	if !ok {
+		log.Info("inserting ARP/NDP instance", "name", instance.Name())
+		m.instances[instance.Name()] = instance
 	} else {
 		i.mu.Lock()
 		defer i.mu.Unlock()
@@ -59,50 +54,20 @@ func (m *Manager) Insert(instance *Instance) {
 }

 func (m *Manager) Remove(instance *Instance) {
-	m.RemoveWithIPDelete(instance, true)
-}
-
-// RemoveOnLeadershipLoss removes an ARP instance when leadership is lost
-func (m *Manager) RemoveOnLeadershipLoss(instance *Instance) {
-	// Use the inverse of PreserveVIPOnLeadershipLoss to decide whether to delete the IP
-	// If preserve is true, don't delete IP (deleteIP = false)
-	// If preserve is false, delete IP (deleteIP = true), This is the legacy behavior
-	deleteIP := !m.config.PreserveVIPOnLeadershipLoss
-	m.RemoveWithIPDelete(instance, deleteIP)
-}
-
-func (m *Manager) RemoveWithIPDelete(instance *Instance, deleteIP bool) {
-	i, err := m.get(instance.Name())
-	if err != nil {
-		log.Error("[ARP manager] unable to remove the instance", "err", err)
-		return
-	}
-	if i != nil {
+	if i, ok := m.instances[instance.Name()]; ok {
 		i.mu.Lock()
 		defer i.mu.Unlock()
 		if i.counter > 1 {
 			i.counter--
 		} else {
-			log.Info("[ARP manager] removing ARP/NDP instance", "name", instance.Name())
-			if deleteIP {
-				if _, err := instance.network.DeleteIP(); err != nil {
-					log.Error("failed to delete IP", "address", instance.network.IP(), "err", err)
-				}
-			}
-			m.instances.Delete(instance.Name())
+			log.Info("removing ARP/NDP instance", "name", instance.Name())
+			delete(m.instances, instance.Name())
 		}
-	} else {
-		log.Warn("[ARP manager] unable to remove the instance - instance not found", "name", instance.Name())
 	}
 }

 func (m *Manager) Count(name string) int {
-	i, err := m.get(name)
-	if err != nil {
-		log.Error("[ARP manager] unable to count instance", "err", err)
-		return -1
-	}
-	if i != nil {
+	if i, ok := m.instances[name]; ok {
 		i.mu.Lock()
 		defer i.mu.Unlock()
 		return i.counter
@@ -111,46 +76,26 @@ func (m *Manager) Count(name string) int {
 }

 func (m *Manager) StartAdvertisement(ctx context.Context) {
-	log.Info("[ARP manager] starting ARP/NDP advertisement")
+	log.Info("Starting ARP/NDP advertisement")
 	for {
 		select {
 		case <-ctx.Done(): // if cancel() execute
 			return
 		default:
-			m.instances.Range(func(_ any, instance any) bool {
-				if i, ok := instance.(*Instance); ok {
-					if i.counter > 0 {
-						ensureIPAndSendGratuitous(i)
-					} else {
-						// this instance should not be advertised - delete the IP just in case...
-						if _, err := i.network.DeleteIP(); err != nil {
-							log.Error("[ARP manager] failed to delete IP", "address", i.network.IP(), "err", err)
-						}
-					}
+			for _, instance := range m.instances {
+				if instance.counter > 0 {
+					ensureIPAndSendGratuitous(instance)
 				}
-				return true
-			})
+			}
 		}
 		if m.config.ArpBroadcastRate < 500 {
-			log.Warn("[ARP manager] arp broadcast rate is too low", "rate (ms)", m.config.ArpBroadcastRate, "setting to (ms)", "3000")
+			log.Error("arp broadcast rate is too low", "rate (ms)", m.config.ArpBroadcastRate, "setting to (ms)", "3000")
 			m.config.ArpBroadcastRate = 3000
 		}
 		time.Sleep(time.Duration(m.config.ArpBroadcastRate) * time.Millisecond)
 	}
 }

-func (m *Manager) get(name string) (*Instance, error) {
-	i, exists := m.instances.Load(name)
-	if !exists {
-		return nil, nil
-	}
-	inst, ok := i.(*Instance)
-	if !ok {
-		return nil, fmt.Errorf("value for name %q is not of Instance pointer type", name)
-	}
-	return inst, nil
-}
-
 // ensureIPAndSendGratuitous - adds IP to the interface if missing, and send
 // either a gratuitous ARP or gratuitous NDP. Re-adds the interface if it is IPv6
 // and in a dadfailed state.
@@ -166,27 +111,23 @@ func ensureIPAndSendGratuitous(instance *Instance) {
 			log.Warn(err.Error())
 		}
 		if deleted {
-			log.Info("deleted and recreating address with NODAD flag to skip DAD", "IP", ipString, "interface", iface)
-			// Re-add immediately without DAD check since we're recovering from DADFAILED
-			// The AddIP function will set IFA_F_NODAD flag for IPv6 addresses when skipDAD=true
-			if _, err := instance.network.AddIP(false, true); err != nil {
-				log.Error("failed to recreate address after DADFAILED", "IP", ipString, "interface", iface, "err", err)
-			} else {
-				log.Info("successfully recreated address after DADFAILED recovery", "IP", ipString, "interface", iface)
-			}
+			log.Info("deleted and recreating address", "IP", ipString, "interface", iface)
+			// if _, err := instance.network.AddIP(false); err != nil {
+			// 	log.Error("failed to recreate address", "IP", ipString, "interface", iface)
+			// }
 		}
-		// Return early after DADFAILED recovery to avoid double IP addition
-		return
 	}

-	// Normal case: add IP with precheck and normal DAD process
-	if added, err := instance.network.AddIP(true, false); err != nil {
+	// Ensure the address exists on the interface before attempting to ARP
+	// if instance.network.HasEndpoints() {
+	if added, err := instance.network.AddIP(true); err != nil {
 		log.Warn(err.Error())
 	} else if added {
 		log.Warn("Re-applied the VIP configuration", "ip", ipString, "interface", iface)
 	}
+	// }

-	if utils.IsIPv6(ipString) {
+	if vip.IsIPv6(ipString) {
 		// Gratuitous NDP, will broadcast new MAC <-> IPv6 address
 		if instance.ndp == nil {
 			log.Error("NDP responder was not created")
@@ -204,4 +145,5 @@ func ensureIPAndSendGratuitous(instance *Instance) {
 			log.Warn(err.Error())
 		}
 	}
+
 }
--- a/pkg/backend/backend.go
+++ b/pkg/backend/backend.go
@@ -8,6 +8,7 @@ import (

 	"github.com/kube-vip/kube-vip/pkg/k8s"
 	"github.com/kube-vip/kube-vip/pkg/utils"
+	"github.com/kube-vip/kube-vip/pkg/vip"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
@@ -30,7 +31,7 @@ func (e *Entry) Check() bool {
 	// homeConfigPath := filepath.Join(os.Getenv("HOME"), ".kube", "config")

 	var k8sAddr string
-	if utils.IsIPv4(e.Addr) {
+	if vip.IsIPv4(e.Addr) {
 		k8sAddr = fmt.Sprintf("%s:%v", e.Addr, e.Port)
 	} else {
 		k8sAddr = fmt.Sprintf("[%s]:%v", e.Addr, e.Port)
--- a/pkg/bgp/peers.go
+++ b/pkg/bgp/peers.go
@@ -4,19 +4,18 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strconv"
+	"strings"

 	//nolint
-
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
+	"github.com/kube-vip/kube-vip/pkg/vip"
 	api "github.com/osrg/gobgp/v3/api"
-
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/osrg/gobgp/v3/pkg/server"
 	"google.golang.org/protobuf/types/known/anypb"
 )

 // AddPeer will add peers to the BGP configuration
-func (b *Server) AddPeer(peer kubevip.BGPPeer) (err error) {
+func (b *Server) AddPeer(peer Peer) (err error) {
 	p := &api.Peer{
 		Conf: &api.PeerConf{
 			NeighborAddress: peer.Address,
@@ -67,9 +66,9 @@ func (b *Server) AddPeer(peer kubevip.BGPPeer) (err error) {
 			},
 		}

-		peer.SetMpbgpOptions(b.c)
+		peer.setMpbgpOptions(b.c)

-		ipv4Address, ipv6Address, err := peer.FindMpbgpAddresses(p, b.c)
+		ipv4Address, ipv6Address, err := peer.findMpbgpAddresses(p, b.c)
 		if err != nil {
 			return fmt.Errorf("failed to get MP-BGP addresses: %w", err)
 		}
@@ -77,7 +76,7 @@ func (b *Server) AddPeer(peer kubevip.BGPPeer) (err error) {
 		mask := "128"
 		address := ipv4Address
 		family := api.Family_AFI_IP
-		if utils.IsIPv4(p.Conf.NeighborAddress) {
+		if vip.IsIPv4(p.Conf.NeighborAddress) {
 			mask = "32"
 			address = ipv6Address
 			family = api.Family_AFI_IP6
@@ -172,6 +171,104 @@ func (b *Server) getPath(ip net.IP) (path *api.Path) {
 	return
 }

+// ParseBGPPeerConfig - take a string and parses it into an array of peers
+func ParseBGPPeerConfig(config string) (bgpPeers []Peer, err error) {
+	peers := strings.Split(config, ",")
+	if len(peers) == 0 {
+		return nil, fmt.Errorf("no BGP Peer configurations found")
+	}
+
+	for x := range peers {
+		peerStr := peers[x]
+		config := strings.Split(peerStr, "/")
+		peerStr = config[0]
+		if peerStr == "" {
+			continue
+		}
+		isV6Peer := peerStr[0] == '['
+
+		address := ""
+		if isV6Peer {
+			addressEndPos := strings.IndexByte(peerStr, ']')
+			if addressEndPos == -1 {
+				return nil, fmt.Errorf("no matching ] found for IPv6 BGP Peer")
+			}
+			address = peerStr[1:addressEndPos]
+			peerStr = peerStr[addressEndPos+1:]
+		}
+
+		peer := strings.Split(peerStr, ":")
+		if len(peer) < 2 {
+			return nil, fmt.Errorf("mandatory peering params <host>:<AS> incomplete")
+		}
+
+		if !isV6Peer {
+			address = peer[0]
+		}
+
+		ASNumber, err := strconv.ParseUint(peer[1], 10, 32)
+		if err != nil {
+			return nil, fmt.Errorf("BGP Peer AS format error [%s]", peer[1])
+		}
+
+		password := ""
+		if len(peer) >= 3 {
+			password = peer[2]
+		}
+
+		multiHop := false
+		if len(peer) >= 4 {
+			multiHop, err = strconv.ParseBool(peer[3])
+			if err != nil {
+				return nil, fmt.Errorf("BGP MultiHop format error (true/false) [%s]", peer[1])
+			}
+		}
+
+		var port uint64
+		if len(peer) >= 5 {
+			port, err = strconv.ParseUint(peer[4], 10, 16)
+			if err != nil {
+				return nil, fmt.Errorf("BGP Peer AS format error [%s]", peer[1])
+			}
+		} else {
+			port = 179
+		}
+
+		var mpbgpNexthop, mpbgpIPv4, mpbgpIPv6 string
+
+		if len(config) > 1 {
+			configData := strings.Split(config[1], ";")
+			for _, cfg := range configData {
+				c := strings.Split(cfg, "=")
+				switch c[0] {
+				case "mpbgp_nexthop":
+					mpbgpNexthop = c[1]
+				case "mpbgp_ipv4":
+					mpbgpIPv4 = c[1]
+				case "mpbgp_ipv6":
+					mpbgpIPv6 = c[1]
+				default:
+					return nil, fmt.Errorf("peer configuration parameter '%s' is not supported", c[0])
+				}
+			}
+		}
+
+		peerConfig := Peer{
+			Address:      address,
+			AS:           uint32(ASNumber),
+			Port:         uint16(port),
+			Password:     password,
+			MultiHop:     multiHop,
+			MpbgpNexthop: mpbgpNexthop,
+			MpbgpIPv4:    mpbgpIPv4,
+			MpbgpIPv6:    mpbgpIPv6,
+		}
+
+		bgpPeers = append(bgpPeers, peerConfig)
+	}
+	return
+}
+
 func insertPolicy(s *server.BgpServer, address string, p *api.Peer, family api.Family_Afi) error {
 	familyType := "v4"
 	if family == api.Family_AFI_IP6 {
--- a/pkg/bgp/peers_test.go
+++ b/pkg/bgp/peers_test.go
@@ -3,8 +3,6 @@ package bgp
 import (
 	"reflect"
 	"testing"
-
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
 )

 func TestParseBGPPeerConfig(t *testing.T) {
@@ -14,13 +12,13 @@ func TestParseBGPPeerConfig(t *testing.T) {
 	tests := []struct {
 		name         string
 		args         args
-		wantBgpPeers []kubevip.BGPPeer
+		wantBgpPeers []Peer
 		wantErr      bool
 	}{
 		{
 			name: "IPv4, default port",
 			args: args{config: "192.168.0.10:65000::false,192.168.0.11:65000::false"},
-			wantBgpPeers: []kubevip.BGPPeer{
+			wantBgpPeers: []Peer{
 				{Address: "192.168.0.10", Port: 179, AS: 65000, MultiHop: false},
 				{Address: "192.168.0.11", Port: 179, AS: 65000, MultiHop: false},
 			},
@@ -28,7 +26,7 @@ func TestParseBGPPeerConfig(t *testing.T) {
 		{
 			name: "IPv4, different port",
 			args: args{config: "192.168.0.10:65000::false:180,192.168.0.11:65000::false:190"},
-			wantBgpPeers: []kubevip.BGPPeer{
+			wantBgpPeers: []Peer{
 				{Address: "192.168.0.10", Port: 180, AS: 65000, MultiHop: false},
 				{Address: "192.168.0.11", Port: 190, AS: 65000, MultiHop: false},
 			},
@@ -36,14 +34,14 @@ func TestParseBGPPeerConfig(t *testing.T) {
 		{
 			name: "IPv6, multi-protocol",
 			args: args{config: "[fd00:1111:2222:3333:c7d9:7235:6bf7:5d52]:65501::false/mpbgp_nexthop=auto_sourceif"},
-			wantBgpPeers: []kubevip.BGPPeer{
+			wantBgpPeers: []Peer{
 				{Address: "fd00:1111:2222:3333:c7d9:7235:6bf7:5d52", Port: 179, AS: 65501, MultiHop: false, MpbgpNexthop: "auto_sourceif"},
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			gotBgpPeers, err := kubevip.ParseBGPPeerConfig(tt.args.config)
+			gotBgpPeers, err := ParseBGPPeerConfig(tt.args.config)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("ParseBGPPeerConfig() error = %v, wantErr %v", err, tt.wantErr)
 				return
--- a/pkg/bgp/server.go
+++ b/pkg/bgp/server.go
@@ -7,24 +7,13 @@ import (

 	log "log/slog"

-	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	api "github.com/osrg/gobgp/v3/api"
 	gobgp "github.com/osrg/gobgp/v3/pkg/server"
 	"github.com/prometheus/client_golang/prometheus"
 )

-// Server manages a server object
-type Server struct {
-	s *gobgp.BgpServer
-	c *kubevip.BGPConfig
-
-	// This is a prometheus gauge indicating the state of the sessions.
-	// 1 means "ESTABLISHED", 0 means "NOT ESTABLISHED"
-	BGPSessionInfoGauge *prometheus.GaugeVec
-}
-
 // NewBGPServer takes a configuration and returns a running BGP server instance
-func NewBGPServer(c kubevip.BGPConfig) (b *Server, err error) {
+func NewBGPServer(c *Config) (b *Server, err error) {
 	if c.AS == 0 {
 		return nil, fmt.Errorf("you need to provide AS")
 	}
@@ -39,7 +28,7 @@ func NewBGPServer(c kubevip.BGPConfig) (b *Server, err error) {

 	b = &Server{
 		s: gobgp.NewBgpServer(),
-		c: &c,
+		c: c,

 		BGPSessionInfoGauge: prometheus.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: "kube_vip",
--- a/pkg/kubevip/config_bgp.go
+++ b/pkg/kubevip/config_bgp.go
@@ -1,19 +1,18 @@
-package kubevip
+package bgp

 import (
 	"fmt"
 	"net"
-	"strconv"
-	"strings"

-	"github.com/kube-vip/kube-vip/pkg/utils"
+	"github.com/kube-vip/kube-vip/pkg/vip"
 	api "github.com/osrg/gobgp/v3/api"
-
+	gobgp "github.com/osrg/gobgp/v3/pkg/server"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/vishvananda/netlink"
 )

 // Peer defines a BGP Peer
-type BGPPeer struct {
+type Peer struct {
 	Address      string
 	Port         uint16
 	AS           uint32
@@ -24,131 +23,21 @@ type BGPPeer struct {
 	MpbgpIPv6    string
 }

-// Config defines the BGP server configuration
-type BGPConfig struct {
-	AS           uint32
-	RouterID     string
-	SourceIP     string
-	SourceIF     string
-	MpbgpNexthop string
-	MpbgpIPv4    string
-	MpbgpIPv6    string
-
-	HoldTime          uint64
-	KeepaliveInterval uint64
-
-	Peers []BGPPeer
-
-	Zebra ZebraConfig
-}
-
-// Defines Zebra connection configuration. More on the topic - https://github.com/osrg/gobgp/blob/master/docs/sources/zebra.md#configuration
-type ZebraConfig struct {
-	Enabled      bool
-	URL          string
-	Version      uint32
-	SoftwareName string
-}
-
-// ParseBGPPeerConfig - take a string and parses it into an array of peers
-func ParseBGPPeerConfig(config string) (bgpPeers []BGPPeer, err error) {
-	peers := strings.Split(config, ",")
-	if len(peers) == 0 {
-		return nil, fmt.Errorf("no BGP Peer configurations found")
+func (p *Peer) setMpbgpOptions(server *Config) {
+	if p.MpbgpNexthop == "" {
+		p.MpbgpNexthop = server.MpbgpNexthop
 	}

-	for x := range peers {
-		peerStr := peers[x]
-		config := strings.Split(peerStr, "/")
-		peerStr = config[0]
-		if peerStr == "" {
-			continue
-		}
-		isV6Peer := peerStr[0] == '['
-
-		address := ""
-		if isV6Peer {
-			addressEndPos := strings.IndexByte(peerStr, ']')
-			if addressEndPos == -1 {
-				return nil, fmt.Errorf("no matching ] found for IPv6 BGP Peer")
-			}
-			address = peerStr[1:addressEndPos]
-			peerStr = peerStr[addressEndPos+1:]
-		}
-
-		peer := strings.Split(peerStr, ":")
-		if len(peer) < 2 {
-			return nil, fmt.Errorf("mandatory peering params <host>:<AS> incomplete")
-		}
-
-		if !isV6Peer {
-			address = peer[0]
-		}
-
-		ASNumber, err := strconv.ParseUint(peer[1], 10, 32)
-		if err != nil {
-			return nil, fmt.Errorf("BGP Peer AS format error [%s]", peer[1])
-		}
-
-		password := ""
-		if len(peer) >= 3 {
-			password = peer[2]
-		}
-
-		multiHop := false
-		if len(peer) >= 4 {
-			multiHop, err = strconv.ParseBool(peer[3])
-			if err != nil {
-				return nil, fmt.Errorf("BGP MultiHop format error (true/false) [%s]", peer[1])
-			}
-		}
-
-		var port uint64
-		if len(peer) >= 5 {
-			port, err = strconv.ParseUint(peer[4], 10, 16)
-			if err != nil {
-				return nil, fmt.Errorf("BGP Peer AS format error [%s]", peer[1])
-			}
-		} else {
-			port = 179
-		}
-
-		var mpbgpNexthop, mpbgpIPv4, mpbgpIPv6 string
-
-		if len(config) > 1 {
-			configData := strings.Split(config[1], ";")
-			for _, cfg := range configData {
-				c := strings.Split(cfg, "=")
-				switch c[0] {
-				case "mpbgp_nexthop":
-					mpbgpNexthop = c[1]
-				case "mpbgp_ipv4":
-					mpbgpIPv4 = c[1]
-				case "mpbgp_ipv6":
-					mpbgpIPv6 = c[1]
-				default:
-					return nil, fmt.Errorf("peer configuration parameter '%s' is not supported", c[0])
-				}
-			}
-		}
-
-		peerConfig := BGPPeer{
-			Address:      address,
-			AS:           uint32(ASNumber),
-			Port:         uint16(port),
-			Password:     password,
-			MultiHop:     multiHop,
-			MpbgpNexthop: mpbgpNexthop,
-			MpbgpIPv4:    mpbgpIPv4,
-			MpbgpIPv6:    mpbgpIPv6,
-		}
-
-		bgpPeers = append(bgpPeers, peerConfig)
+	if p.MpbgpIPv4 == "" {
+		p.MpbgpIPv4 = server.MpbgpIPv4
+	}
+
+	if p.MpbgpIPv6 == "" {
+		p.MpbgpIPv6 = server.MpbgpIPv6
 	}
-	return
 }

-func (p *BGPPeer) FindMpbgpAddresses(ap *api.Peer, server *BGPConfig) (string, string, error) {
+func (p *Peer) findMpbgpAddresses(ap *api.Peer, server *Config) (string, string, error) {
 	var ipv4Address, ipv6Address string
 	switch p.MpbgpNexthop {
 	case "fixed":
@@ -175,20 +64,20 @@ func (p *BGPPeer) FindMpbgpAddresses(ap *api.Peer, server *BGPConfig) (string, s
 		ap.Transport.LocalAddress = server.SourceIP

 		// Resolve the local interface by SourceIP
-		iface, err := utils.GetInterfaceByIP(server.SourceIP)
+		iface, err := vip.GetInterfaceByIP(server.SourceIP)
 		if err != nil {
 			return "", "", fmt.Errorf("failed to get interface by IP: %v", err)
 		}

-		if utils.IsIPv4(server.SourceIP) {
+		if vip.IsIPv4(server.SourceIP) {
 			// Get the non link-local IPv6 address on that interface
-			ipv6Address, err = utils.GetNonLinkLocalIP(iface, netlink.FAMILY_V6)
+			ipv6Address, err = vip.GetNonLinkLocalIP(iface, netlink.FAMILY_V6)
 			if err != nil {
 				return "", "", fmt.Errorf("failed to get non link-local IPv6 address: %v", err)
 			}
 		} else {
 			// Get the non link-local IPv4 address on that interface
-			ipv4Address, err = utils.GetNonLinkLocalIP(iface, netlink.FAMILY_V4)
+			ipv4Address, err = vip.GetNonLinkLocalIP(iface, netlink.FAMILY_V4)
 			if err != nil {
 				return "", "", fmt.Errorf("failed to get non link-local IPv4 address: %v", err)
 			}
@@ -202,13 +91,13 @@ func (p *BGPPeer) FindMpbgpAddresses(ap *api.Peer, server *BGPConfig) (string, s
 		}

 		// Get the non link-local IPv4 address on that interface
-		ipv4Address, err = utils.GetNonLinkLocalIP(&iface, netlink.FAMILY_V4)
+		ipv4Address, err = vip.GetNonLinkLocalIP(&iface, netlink.FAMILY_V4)
 		if err != nil {
 			return "", "", fmt.Errorf("failed to get non link-local IPv4 address: %v", err)
 		}

 		// Get the non link-local IPv6 address on that interface
-		ipv6Address, err = utils.GetNonLinkLocalIP(&iface, netlink.FAMILY_V6)
+		ipv6Address, err = vip.GetNonLinkLocalIP(&iface, netlink.FAMILY_V6)
 		if err != nil {
 			return "", "", fmt.Errorf("failed to get non link-local IPv6 address: %v", err)
 		}
@@ -219,16 +108,38 @@ func (p *BGPPeer) FindMpbgpAddresses(ap *api.Peer, server *BGPConfig) (string, s
 	return ipv4Address, ipv6Address, nil
 }

-func (p *BGPPeer) SetMpbgpOptions(server *BGPConfig) {
-	if p.MpbgpNexthop == "" {
-		p.MpbgpNexthop = server.MpbgpNexthop
-	}
+// Config defines the BGP server configuration
+type Config struct {
+	AS           uint32
+	RouterID     string
+	SourceIP     string
+	SourceIF     string
+	MpbgpNexthop string
+	MpbgpIPv4    string
+	MpbgpIPv6    string

-	if p.MpbgpIPv4 == "" {
-		p.MpbgpIPv4 = server.MpbgpIPv4
-	}
+	HoldTime          uint64
+	KeepaliveInterval uint64

-	if p.MpbgpIPv6 == "" {
-		p.MpbgpIPv6 = server.MpbgpIPv6
-	}
+	Peers []Peer
+
+	Zebra ZebraConfig
+}
+
+// Defines Zebra connection configuration. More on the topic - https://github.com/osrg/gobgp/blob/master/docs/sources/zebra.md#configuration
+type ZebraConfig struct {
+	Enabled      bool
+	URL          string
+	Version      uint32
+	SoftwareName string
+}
+
+// Server manages a server object
+type Server struct {
+	s *gobgp.BgpServer
+	c *Config
+
+	// This is a prometheus gauge indicating the state of the sessions.
+	// 1 means "ESTABLISHED", 0 means "NOT ESTABLISHED"
+	BGPSessionInfoGauge *prometheus.GaugeVec
 }
--- a/pkg/cluster/clusterDDNS.go
+++ b/pkg/cluster/clusterDDNS.go
@@ -12,14 +12,16 @@ import (
 // during runtime if IP changes, startDDNS don't have to do reconfigure because
 // dnsUpdater already have the functionality to keep trying resolve the IP
 // and update the VIP configuration if it changes
-func (cluster *Cluster) StartDDNS(ctx context.Context, network vip.Network) error {
-	ddnsMgr := vip.NewDDNSManager(ctx, network)
-	ip, err := ddnsMgr.Start()
-	if err != nil {
-		return err
-	}
-	if err = network.SetIP(ip); err != nil {
-		return err
+func (cluster *Cluster) StartDDNS(ctx context.Context) error {
+	for i := range cluster.Network {
+		ddnsMgr := vip.NewDDNSManager(ctx, cluster.Network[i])
+		ip, err := ddnsMgr.Start()
+		if err != nil {
+			return err
+		}
+		if err = cluster.Network[i].SetIP(ip); err != nil {
+			return err
+		}
 	}

 	return nil
--- a/pkg/cluster/clusterLeaderElection.go
+++ b/pkg/cluster/clusterLeaderElection.go
@@ -15,7 +15,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/k8s"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/loadbalancer"
-	"github.com/kube-vip/kube-vip/pkg/utils"

 	log "log/slog"

@@ -152,7 +151,7 @@ func (cluster *Cluster) StartCluster(c *kubevip.Config, sm *Manager, bgpServer *
 	if c.EnableBGP && bgpServer == nil {
 		// Lets start BGP
 		log.Info("Starting the BGP server to advertise VIP routes to VGP peers")
-		bgpServer, err = bgp.NewBGPServer(c.BGPConfig)
+		bgpServer, err = bgp.NewBGPServer(&c.BGPConfig)
 		if err != nil {
 			log.Error("new BGP server", "err", err)
 		}
@@ -166,26 +165,6 @@ func (cluster *Cluster) StartCluster(c *kubevip.Config, sm *Manager, bgpServer *
 		leaseID: c.NodeName,
 		sm:      sm,
 		onStartedLeading: func(ctx context.Context) { //nolint TODO: potential clean code
-			// When we become leader, ensure we can take over VIPs even if they're preserved on other nodes
-			if c.PreserveVIPOnLeadershipLoss {
-				log.Info("Becoming leader with VIP preservation enabled - ensuring VIP takeover")
-				// Force add the VIPs (this will work even if they exist due to the precheck logic)
-				for i := range cluster.Network {
-					added, err := cluster.Network[i].AddIP(true, false)
-					if err != nil {
-						log.Error("failed to ensure VIP on leader takeover", "vip", cluster.Network[i].IP(), "err", err)
-					} else if added {
-						log.Info("took over VIP as new leader", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-					} else {
-						log.Info("VIP already configured on interface", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-					}
-				}
-			}
-
-			// Start ARP advertisements now that we have leadership
-			log.Info("Start ARP/NDP advertisement")
-			go cluster.arpMgr.StartAdvertisement(ctxArp)
-
 			// As we're leading lets start the vip service
 			err := cluster.vipService(ctxArp, ctxDNS, c, sm, bgpServer, cancel)
 			if err != nil {
@@ -209,36 +188,13 @@ func (cluster *Cluster) StartCluster(c *kubevip.Config, sm *Manager, bgpServer *
 				}
 			}

-			// Handle VIP cleanup based on configuration
-			if c.PreserveVIPOnLeadershipLoss {
-				// For IPv6, we must remove VIPs immediately to avoid DAD failures on the new leader
-				// IPv6 Duplicate Address Detection will fail if the new leader tries to add an IP that is still present on this node's interface
-				// We need to check each VIP individually and only remove IPv6 VIPs
-				for i := range cluster.Network {
-					if utils.IsIPv6(cluster.Network[i].IP()) {
-						log.Info("Removing IPv6 VIP immediately (required to prevent DAD failures on new leader)", "ip", cluster.Network[i].IP())
-						deleted, err := cluster.Network[i].DeleteIP()
-						if err != nil {
-							log.Warn("delete VIP", "err", err)
-						}
-						if deleted {
-							log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-						}
-					} else {
-						log.Info("Preserving IPv4 VIP address on interface, only stopped ARP broadcasting", "ip", cluster.Network[i].IP())
-					}
+			for i := range cluster.Network {
+				deleted, err := cluster.Network[i].DeleteIP()
+				if err != nil {
+					log.Warn("delete VIP", "err", err)
 				}
-			} else {
-				// Legacy behavior: delete VIP addresses on leadership loss
-				log.Info("Deleting VIP addresses on leadership loss (legacy behavior)")
-				for i := range cluster.Network {
-					deleted, err := cluster.Network[i].DeleteIP()
-					if err != nil {
-						log.Warn("delete VIP", "err", err)
-					}
-					if deleted {
-						log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-					}
+				if deleted {
+					log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
 				}
 			}

@@ -248,23 +204,6 @@ func (cluster *Cluster) StartCluster(c *kubevip.Config, sm *Manager, bgpServer *
 		onNewLeader: func(identity string) {
 			// we're notified when new leader elected
 			log.Info("New leader", "leader", identity)
-
-			// If we're not the new leader and we have VIPs preserved from previous leadership,
-			// we need to clean them up to avoid conflicts.
-			if identity != c.NodeName && c.PreserveVIPOnLeadershipLoss {
-				log.Info("Cleaning up preserved VIPs as another node became leader", "new_leader", identity)
-				for i := range cluster.Network {
-					deleted, err := cluster.Network[i].DeleteIP()
-					if err != nil {
-						log.Warn("failed to cleanup preserved VIP", "vip", cluster.Network[i].IP(), "err", err)
-					}
-					if deleted {
-						log.Info("cleaned up preserved VIP to avoid conflict", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface(), "new_leader", identity)
-					} else {
-						log.Debug("VIP was not present on this node", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-					}
-				}
-			}
 		},
 	}

--- a/pkg/cluster/service.go
+++ b/pkg/cluster/service.go
@@ -18,7 +18,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/bgp"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/loadbalancer"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 	"github.com/vishvananda/netlink"
 	corev1 "k8s.io/api/core/v1"
@@ -46,17 +45,15 @@ func (cluster *Cluster) vipService(ctxArp, ctxDNS context.Context, c *kubevip.Co

 	for i := range cluster.Network {
 		network := cluster.Network[i]
-
-		if network.IsDDNS() {
-			if err := cluster.StartDDNS(ctxDNS, cluster.Network[i]); err != nil {
-				log.Error("failed to start DDNS", "err", err)
-			}
-		}
-
 		if err := network.SetMask(c.VIPSubnet); err != nil {
 			log.Error("failed to set mask", "subnet", c.VIPSubnet, "err", err)
 			panic("")
 		}
+		if network.IsDDNS() {
+			if err := cluster.StartDDNS(ctxDNS); err != nil {
+				log.Error(err.Error())
+			}
+		}

 		// start the dns updater if address is dns
 		if network.IsDNS() {
@@ -66,8 +63,7 @@ func (cluster *Cluster) vipService(ctxArp, ctxDNS context.Context, c *kubevip.Co
 		}

 		if !c.EnableRoutingTable {
-			// Normal VIP addition, use skipDAD=false for normal DAD process
-			if _, err = network.AddIP(false, false); err != nil {
+			if _, err = network.AddIP(false); err != nil {
 				log.Error(err.Error())
 			}
 		}
@@ -177,7 +173,6 @@ func (cluster *Cluster) vipService(ctxArp, ctxDNS context.Context, c *kubevip.Co
 					log.Error("failed to check IP type", "IP", networkIP, "error", err)
 					continue
 				}
-				log.Debug("current ip to process", "ip", networkIP)

 				backendMap := &backendMapV4
 				if isNetworkV6 {
@@ -185,11 +180,8 @@ func (cluster *Cluster) vipService(ctxArp, ctxDNS context.Context, c *kubevip.Co
 				}

 				for entry := range *backendMap {
-					log.Debug("entry.Check() for entry", "entry", entry)
 					if entry.Check() {
-						log.Debug("entry.Check() true")
-						// Normal VIP addition with precheck, use skipDAD=false for normal DAD process
-						_, err = network.AddIP(true, false)
+						_, err = network.AddIP(true)
 						if err != nil {
 							log.Error("error adding address", "err", err)
 						}
@@ -276,10 +268,8 @@ func (cluster *Cluster) StartLoadBalancerService(ctx context.Context, c *kubevip

 	var arpWG sync.WaitGroup

-	log.Debug("StartLoadBalancerService")
 	for i := range cluster.Network {
 		network := cluster.Network[i]
-		log.Debug("current ip to process", "ip", network.IP(), "mask", c.VIPSubnet)
 		if err := network.SetMask(c.VIPSubnet); err != nil {
 			log.Error("failed to set mask", "subnet", c.VIPSubnet, "err", err)
 			panic("")
@@ -288,22 +278,16 @@ func (cluster *Cluster) StartLoadBalancerService(ctx context.Context, c *kubevip
 		if err != nil {
 			log.Warn("attempted to clean existing VIP", "err", err)
 		}
-		log.Debug("config flags", "enable_routing_table", c.EnableRoutingTable, "enable_leader_election", c.EnableLeaderElection, "enable_services_election", c.EnableServicesElection)

 		if c.EnableRoutingTable && (c.EnableLeaderElection || c.EnableServicesElection) {
 			err = network.AddRoute(false)
 			if err != nil {
 				log.Warn(err.Error())
-			} else {
-				log.Info("successful add Route")
 			}
-		}
-
-		// Normal VIP addition, use skipDAD=false for normal DAD process
-		if _, err = network.AddIP(false, false); err != nil {
-			log.Warn(err.Error())
-		} else {
-			log.Info("successful add IP")
+		} else if !c.EnableRoutingTable {
+			if _, err = network.AddIP(false); err != nil {
+				log.Warn(err.Error())
+			}
 		}

 		if c.EnableARP {
@@ -346,37 +330,16 @@ func (cluster *Cluster) StartLoadBalancerService(ctx context.Context, c *kubevip
 			return
 		}
 		for i := range cluster.Network {
-			if c.EnableARP && cluster.arpMgr.Count(cluster.Network[i].ARPName()) > 1 {
+			if c.EnableARP && cluster.arpMgr.Count(cluster.Network[i].ARPName()) > 0 {
 				continue
 			}
-
-			// Handle VIP cleanup based on configuration
-			if c.PreserveVIPOnLeadershipLoss {
-				// For IPv6, we must remove VIPs immediately to avoid DAD failures on the new leader
-				// IPv6 Duplicate Address Detection will fail if the new leader tries to add an IP
-				// that is still present on this node's interface
-				if utils.IsIPv6(cluster.Network[i].IP()) {
-					log.Info("[VIP] Removing IPv6 VIP immediately (required to prevent DAD failures on new leader)", "ip", cluster.Network[i].IP())
-					deleted, err := cluster.Network[i].DeleteIP()
-					if err != nil {
-						log.Warn(err.Error())
-					}
-					if deleted {
-						log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-					}
-				} else {
-					log.Info("[VIP] Preserving IPv4 VIP address on interface, only stopped ARP broadcasting", "ip", cluster.Network[i].IP())
-				}
-			} else {
-				// Legacy behavior: delete VIP addresses on leadership loss
-				log.Info("[VIP] Deleting VIP", "ip", cluster.Network[i].IP())
-				deleted, err := cluster.Network[i].DeleteIP()
-				if err != nil {
-					log.Warn(err.Error())
-				}
-				if deleted {
-					log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
-				}
+			log.Info("[VIP] Deleting VIP", "ip", cluster.Network[i].IP())
+			deleted, err := cluster.Network[i].DeleteIP()
+			if err != nil {
+				log.Warn(err.Error())
+			}
+			if deleted {
+				log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
 			}
 		}

@@ -391,7 +354,7 @@ func (cluster *Cluster) layer2Update(ctx context.Context, network vip.Network, c
 	var ndp *vip.NdpResponder
 	var err error
 	ipString := network.IP()
-	if utils.IsIPv6(ipString) {
+	if vip.IsIPv6(ipString) {
 		if network.IPisLinkLocal() {
 			log.Error("layer2 is link-local can't use NDP", "address", ipString)

@@ -414,5 +377,5 @@ func (cluster *Cluster) layer2Update(ctx context.Context, network vip.Network, c

 	<-ctx.Done() // if cancel() execute
 	log.Debug("ending layer 2 update", "ip", ipString, "interface", network.Interface(), "ms", c.ArpBroadcastRate)
-	cluster.arpMgr.RemoveOnLeadershipLoss(arpInstance)
+	cluster.arpMgr.Remove(arpInstance)
 }
--- a/pkg/cluster/singleNode.go
+++ b/pkg/cluster/singleNode.go
@@ -32,8 +32,7 @@ func (cluster *Cluster) StartSingleNode(c *kubevip.Config, disableVIP bool) erro
 				log.Info("deleted address", "IP", cluster.Network[i].IP(), "interface", cluster.Network[i].Interface())
 			}

-			// Normal VIP addition for single node, use skipDAD=false for normal DAD process
-			_, err = cluster.Network[i].AddIP(false, false)
+			_, err = cluster.Network[i].AddIP(false)
 			if err != nil {
 				log.Warn(err.Error())
 			}
--- a/pkg/egress/egress.go
+++ b/pkg/egress/egress.go
@@ -7,7 +7,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/iptables"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/nftables"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 )

@@ -20,7 +19,7 @@ func Teardown(podIP, vipIP, namespace, serviceUUID string, annotations map[strin

 	protocol := iptables.ProtocolIPv4
 	IPv6 := false
-	if utils.IsIPv6(podIP) {
+	if vip.IsIPv6(podIP) {
 		protocol = iptables.ProtocolIPv6
 		IPv6 = true
 	}
--- a/pkg/endpoints/endpoints_bgp.go
+++ b/pkg/endpoints/endpoints_bgp.go
@@ -57,7 +57,7 @@ func (b *BGP) clear(ctx *servicecontext.Context, lastKnownGoodEndpoint *string,
 					} else {
 						log.Info("deleted BGP host", "provider",
 							b.provider.GetLabel(), "ip", cluster.Network[i].IP(), "service name", service.Name, "namespace", service.Namespace)
-						ctx.ConfiguredNetworks.Delete(cluster.Network[i].IP())
+						ctx.ConfiguredNetworks.Delete(cluster.Network[i])
 						*leaderElectionActive = false
 					}
 				}
@@ -110,10 +110,6 @@ func ClearBGPHosts(service *v1.Service, instances *[]*instance.Instance, bgpServ
 }

 func ClearBGPHostsByInstance(instance *instance.Instance, bgpServer *bgp.Server) {
-	if instance == nil {
-		log.Error("failed to clear BGP host for nil instance")
-		return
-	}
 	for _, cluster := range instance.Clusters {
 		for i := range cluster.Network {
 			network := cluster.Network[i]
--- a/pkg/endpoints/endpoints_routing_table.go
+++ b/pkg/endpoints/endpoints_routing_table.go
@@ -117,9 +117,9 @@ func (rt *RoutingTable) deleteAction(service *v1.Service) {
 }

 func (rt *RoutingTable) setInstanceEndpointsStatus(service *v1.Service, endpoints []string) error {
-	instance := instance.FindServiceInstanceWithTimeout(service, *rt.instances)
+	instance := instance.FindServiceInstance(service, *rt.instances)
 	if instance == nil {
-		log.Error("failed to find the instance", "namespace", service.Namespace, "name", service.Name, "uid", service.UID, "provider", rt.provider.GetLabel())
+		log.Error("failed to find the instance", "service", service.UID, "provider", rt.provider.GetLabel())
 	} else {
 		for _, c := range instance.Clusters {
 			for n := range c.Network {
@@ -140,34 +140,23 @@ func (rt *RoutingTable) setInstanceEndpointsStatus(service *v1.Service, endpoint

 func ClearRoutes(service *v1.Service, instances *[]*instance.Instance) []error {
 	errs := []error{}
-	if svcInst := instance.FindServiceInstance(service, *instances); svcInst != nil {
-		clearErrs := ClearRoutesByInstance(service, svcInst, instances)
-		errs = append(errs, clearErrs...)
-	}
-	return errs
-}
-
-func ClearRoutesByInstance(service *v1.Service, svcInst *instance.Instance, instances *[]*instance.Instance) []error {
-	if svcInst == nil {
-		return []error{fmt.Errorf("failed to remove routes for nil instance of service %s/%s, uid: %s", service.Namespace, service.Name, service.UID)}
-	}
-	errs := []error{}
-	for _, cluster := range svcInst.Clusters {
-		for i := range cluster.Network {
-			route := cluster.Network[i].PrepareRoute()
-			// check if route we are about to delete is not referenced by more than one service
-			if CountRouteReferences(route, instances) <= 1 {
-				err := cluster.Network[i].DeleteRoute()
-				if err != nil && !errors.Is(err, syscall.ESRCH) {
-					log.Error("failed to delete route", "ip", cluster.Network[i].IP(), "err", err)
-					errs = append(errs, err)
+	if instance := instance.FindServiceInstance(service, *instances); instance != nil {
+		for _, cluster := range instance.Clusters {
+			for i := range cluster.Network {
+				route := cluster.Network[i].PrepareRoute()
+				// check if route we are about to delete is not referenced by more than one service
+				if CountRouteReferences(route, instances) <= 1 {
+					err := cluster.Network[i].DeleteRoute()
+					if err != nil && !errors.Is(err, syscall.ESRCH) {
+						log.Error("failed to delete route", "ip", cluster.Network[i].IP(), "err", err)
+						errs = append(errs, err)
+					}
+					log.Debug("deleted route", "ip",
+						cluster.Network[i].IP(), "service name", service.Name, "namespace", service.Namespace, "interface", cluster.Network[i].Interface())
 				}
-				log.Debug("deleted route", "ip",
-					cluster.Network[i].IP(), "service name", service.Name, "namespace", service.Namespace, "interface", cluster.Network[i].Interface())
 			}
 		}
 	}
-
 	return errs
 }

--- a/pkg/endpoints/providers/endpointslices.go
+++ b/pkg/endpoints/providers/endpointslices.go
@@ -71,7 +71,7 @@ func (ep *Endpointslices) GetAllEndpoints() ([]string, error) {
 func (ep *Endpointslices) GetLocalEndpoints(id string, _ *kubevip.Config) ([]string, error) {
 	var localEndpoints []string
 	for _, endpoint := range ep.endpoints.Endpoints {
-		if endpoint.Conditions.Serving == nil || !*endpoint.Conditions.Serving {
+		if !*endpoint.Conditions.Serving {
 			continue
 		}
 		for _, address := range endpoint.Addresses {
--- a/pkg/etcd/election.go
+++ b/pkg/etcd/election.go
@@ -221,7 +221,7 @@ func (m *member) tryToBeLeader(ctx context.Context) {

 func (m *member) resignOnCancel(ctx context.Context) {
 	<-ctx.Done()
-	if err := m.election.Resign(m.client.Ctx()); err != nil && !errors.Is(err, context.Canceled) {
+	if err := m.election.Resign(m.client.Ctx()); err != nil {
 		log.Error("Failed to resign after the context was canceled", "err", err)
 	}
 }
--- a/pkg/etcd/election_test.go
+++ b/pkg/etcd/election_test.go
@@ -32,7 +32,7 @@ func TestRunElectionWithMemberIDCollision(t *testing.T) {
 			Client: cli,
 		},
 		Name:                 electionName,
-		MemberID:             randomElectionNameForTest("my-host"),
+		MemberID:             "my-host",
 		LeaseDurationSeconds: 1,
 		Callbacks: etcd.LeaderCallbacks{
 			OnStartedLeading: func(ctx context.Context) {
@@ -90,21 +90,19 @@ func TestRunElectionWithTwoMembersAndReelection(t *testing.T) {

 	config1 := configBase
 	config1.EtcdConfig.Client = cliMember1
-	config1.MemberID = randomElectionNameForTest("my-host")
+	config1.MemberID = "my-host"
 	uniqueID := rand.Uint64()
 	config1.MemberUniqueID = &uniqueID
 	config1.Callbacks = baseCallbacksForName(config1.MemberID)
-	syncMembers := make(chan (any))
 	config1.Callbacks.OnStartedLeading = func(_ context.Context) {
 		log.Println("I'm my-host, the new leader!!!!")
-		close(syncMembers)
 		log.Println("Losing the leadership on purpose by stopping renewing the lease")
 		g.Expect(cliMember1.Lease.Close()).To(Succeed())
 		log.Println("Member1 leases closed")
 	}

 	config2 := configBase
-	config2.MemberID = randomElectionNameForTest("my-other-host")
+	config2.MemberID = "my-other-host"
 	config2.Callbacks = baseCallbacksForName(config2.MemberID)
 	config2.Callbacks.OnStartedLeading = func(_ context.Context) {
 		log.Println("I'm my-other-host, the new leader!!!!")
@@ -118,14 +116,14 @@ func TestRunElectionWithTwoMembersAndReelection(t *testing.T) {
 	go func() {
 		defer wg.Done()
 		g.Expect(etcd.RunElection(member1Ctx, &config1)).To(Succeed())
-		log.Printf("%s routine done\n", config1.MemberID)
+		log.Println("Member1 routine done")
 	}()

 	go func() {
 		defer wg.Done()
-		<-syncMembers
+		time.Sleep(time.Millisecond * 50) // Make sure member1 becomes leader
 		g.Expect(etcd.RunElection(member2Ctx, &config2)).To(Succeed())
-		log.Printf("%s routine done\n", config2.MemberID)
+		log.Println("Member2 routine done")
 	}()

 	wg.Wait()
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -5,7 +5,6 @@ import (
 	"net"
 	"strconv"
 	"strings"
-	"time"

 	"log/slog"
 	log "log/slog"
@@ -18,7 +17,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/networkinterface"
 	"github.com/kube-vip/kube-vip/pkg/sysctl"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 )

@@ -51,7 +49,8 @@ type Port struct {
 }

 func NewInstance(svc *v1.Service, config *kubevip.Config, intfMgr *networkinterface.Manager, arpMgr *arp.Manager) (*Instance, error) {
-	instanceAddresses, _ := FetchServiceAddresses(svc)
+	instanceAddresses := FetchServiceAddresses(svc)
+	//instanceUID := string(svc.UID)

 	var newVips []*kubevip.Config
 	var link netlink.Link
@@ -121,7 +120,7 @@ func NewInstance(svc *v1.Service, config *kubevip.Config, intfMgr *networkinterf

 		subnet := ""
 		var err error
-		if utils.IsIPv4(address) {
+		if vip.IsIPv4(address) {
 			if ipv4AutoSubnet {
 				subnet, err = autoFindSubnet(link, address)
 				if err != nil {
@@ -151,22 +150,21 @@ func NewInstance(svc *v1.Service, config *kubevip.Config, intfMgr *networkinterf

 		// Generate new Virtual IP configuration
 		newVips = append(newVips, &kubevip.Config{
-			VIP:                         address,
-			Interface:                   svcInterface,
-			SingleNode:                  true,
-			EnableARP:                   config.EnableARP,
-			EnableBGP:                   config.EnableBGP,
-			VIPSubnet:                   subnet,
-			EnableRoutingTable:          config.EnableRoutingTable,
-			RoutingTableID:              config.RoutingTableID,
-			RoutingTableType:            config.RoutingTableType,
-			RoutingProtocol:             config.RoutingProtocol,
-			ArpBroadcastRate:            config.ArpBroadcastRate,
-			EnableServiceSecurity:       config.EnableServiceSecurity,
-			DNSMode:                     config.DNSMode,
-			DisableServiceUpdates:       config.DisableServiceUpdates,
-			EnableServicesElection:      config.EnableServicesElection,
-			PreserveVIPOnLeadershipLoss: config.PreserveVIPOnLeadershipLoss,
+			VIP:                    address,
+			Interface:              svcInterface,
+			SingleNode:             true,
+			EnableARP:              config.EnableARP,
+			EnableBGP:              config.EnableBGP,
+			VIPSubnet:              subnet,
+			EnableRoutingTable:     config.EnableRoutingTable,
+			RoutingTableID:         config.RoutingTableID,
+			RoutingTableType:       config.RoutingTableType,
+			RoutingProtocol:        config.RoutingProtocol,
+			ArpBroadcastRate:       config.ArpBroadcastRate,
+			EnableServiceSecurity:  config.EnableServiceSecurity,
+			DNSMode:                config.DNSMode,
+			DisableServiceUpdates:  config.DisableServiceUpdates,
+			EnableServicesElection: config.EnableServicesElection,
 			KubernetesLeaderElection: kubevip.KubernetesLeaderElection{
 				EnableLeaderElection: config.EnableLeaderElection,
 			},
@@ -409,108 +407,76 @@ func (i *Instance) startDHCP() error {
 	return nil
 }

-// FetchLoadBalancerIngressAddresses tries to get the addresses from status.loadBalancerIP
-func FetchLoadBalancerIngress(s *v1.Service) ([]string, []string) {
+// FetchIngressAddresses tries to get the addresses from status.loadBalancerIP
+func FetchLoadBalancerIngressAddresses(s *v1.Service) []string {
 	// If the service has no status, return empty
 	lbStatusAddresses := []string{}
-	lbStatusHostnames := []string{}
+
 	if len(s.Status.LoadBalancer.Ingress) == 0 {
-		return lbStatusAddresses, lbStatusHostnames
+		return lbStatusAddresses
 	}

 	for _, ingress := range s.Status.LoadBalancer.Ingress {
 		if ingress.IP != "" {
 			lbStatusAddresses = append(lbStatusAddresses, ingress.IP)
 		}
-		if ingress.Hostname != "" {
-			lbStatusHostnames = append(lbStatusHostnames, ingress.Hostname)
-		}
+		// TODO: Handle hostname if needed
 	}
-	return lbStatusAddresses, lbStatusHostnames
+
+	return lbStatusAddresses
 }

 // FetchServiceAddresses tries to get the addresses from annotations
 // kube-vip.io/loadbalancerIPs, then from spec.loadbalancerIP
-func FetchServiceAddresses(s *v1.Service) ([]string, []string) {
+func FetchServiceAddresses(s *v1.Service) []string {
 	annotationAvailable := false
 	if s.Annotations != nil {

 		if v, annotationAvailable := s.Annotations[kubevip.LoadbalancerIPAnnotation]; annotationAvailable {
 			ips := strings.Split(v, ",")
 			var trimmedIPs []string
-			var trimmedHostnames []string
-			for _, a := range ips {
-				a = strings.TrimSpace(a)
-				ip := net.ParseIP(a)
-				if ip == nil {
-					// this is probably a DNS name
-					trimmedHostnames = append(trimmedHostnames, a)
-				} else {
-					trimmedIPs = append(trimmedIPs, ip.String())
-				}
+			for _, ip := range ips {
+				trimmedIPs = append(trimmedIPs, strings.TrimSpace(ip))
 			}
-			return trimmedIPs, trimmedHostnames
+			return trimmedIPs
 		}
 	}

 	lbStatusAddresses := []string{}
-	lbStatusHostnames := []string{}
 	if !annotationAvailable {
-		lbStatusAddresses, lbStatusHostnames = FetchLoadBalancerIngress(s)
-	}
-
-	// Spec.LoadBalancerIP legacy handling
-	// if the loadBalancerIP is different from Status.LoadBalancer.Ingress IPs
-	// return the legacy LB as spec wins over status.
-	if lbIP := net.ParseIP(s.Spec.LoadBalancerIP); lbIP != nil && len(lbStatusAddresses) > 0 {
-		isLbIPv4 := utils.IsIPv4(s.Spec.LoadBalancerIP)
-		for _, a := range lbStatusAddresses {
-			if lbStatusIP := net.ParseIP(a); lbStatusIP != nil && utils.IsIPv4(a) == isLbIPv4 && !lbIP.Equal(lbStatusIP) {
-				return []string{s.Spec.LoadBalancerIP}, []string{}
+		if len(s.Status.LoadBalancer.Ingress) > 0 {
+			for _, ingress := range s.Status.LoadBalancer.Ingress {
+				lbStatusAddresses = append(lbStatusAddresses, ingress.IP)
 			}
 		}
 	}

-	if len(lbStatusAddresses) > 0 || len(lbStatusHostnames) > 0 {
-		return lbStatusAddresses, lbStatusHostnames
+	lbIP := net.ParseIP(s.Spec.LoadBalancerIP)
+	isLbIPv4 := vip.IsIPv4(s.Spec.LoadBalancerIP)
+
+	if len(lbStatusAddresses) > 0 {
+		for _, a := range lbStatusAddresses {
+			if lbStatusIP := net.ParseIP(a); lbStatusIP != nil && lbIP != nil && vip.IsIPv4(a) == isLbIPv4 && !lbIP.Equal(lbStatusIP) {
+				return []string{s.Spec.LoadBalancerIP}
+			}
+		}
+		return lbStatusAddresses
 	}

 	if s.Spec.LoadBalancerIP != "" {
-		return []string{s.Spec.LoadBalancerIP}, []string{}
+		return []string{s.Spec.LoadBalancerIP}
 	}

-	return []string{}, []string{}
+	return []string{}
 }

 func FindServiceInstance(svc *v1.Service, instances []*Instance) *Instance {
-	log.Debug("finding service", "namespace", svc.Namespace, "name", svc.Name, "UID", svc.UID)
+	log.Debug("finding service", "UID", svc.UID)
 	for i := range instances {
 		log.Debug("saved service", "instance", i, "UID", instances[i].ServiceSnapshot.UID)
 		if instances[i].ServiceSnapshot.UID == svc.UID {
 			return instances[i]
 		}
 	}
-	log.Debug("instance not found", "namespace", svc.Namespace, "name", svc.Name, "UID", svc.UID)
 	return nil
 }
-
-func FindServiceInstanceWithTimeout(svc *v1.Service, instances []*Instance) *Instance {
-	log.Debug("finding service with timeout", "namespace", svc.Namespace, "name", svc.Name, "UID", svc.UID)
-	ticker := time.NewTicker(time.Millisecond * 200)
-	defer ticker.Stop()
-	to := time.NewTimer(time.Second * 60)
-	defer to.Stop()
-	for {
-		select {
-		case <-to.C:
-			return nil
-		case <-ticker.C:
-			for i := range instances {
-				log.Debug("saved service", "instance", i, "UID", instances[i].ServiceSnapshot.UID)
-				if instances[i].ServiceSnapshot.UID == svc.UID {
-					return instances[i]
-				}
-			}
-		}
-	}
-}
--- a/pkg/kubevip/annotations.go
+++ b/pkg/kubevip/annotations.go
@@ -40,24 +40,10 @@ const (
 	// Flush the conntrack rules (remove existing sessions) once Egress is configured
 	FlushContrack = "kube-vip.io/flush-conntrack"

-	// Configure LoadBalancer IPs instead of relying on a controller
 	LoadbalancerIPAnnotation = "kube-vip.io/loadbalancerIPs"
-
-	// Ignore the LoadBalancer Service
-	LoadbalancerIgnore = "kube-vip.io/ignore"
-
-	// Used to configure DHCP with a Hostname
-	LoadbalancerHostname = "kube-vip.io/loadbalancerHostname"
-
-	// Define an interface name to bind the address of the LoadBalancer to
-	ServiceInterface = "kube-vip.io/serviceInterface"
-
-	ServiceSecurityIgnore = "kube-vip.io/ignore-service-security"
-
-	// Enable UPNP on a Service
-	UpnpEnabled = "kube-vip.io/forwardUPNP"
+	LoadbalancerHostname     = "kube-vip.io/loadbalancerHostname"
+	ServiceInterface         = "kube-vip.io/serviceInterface"
+	UpnpEnabled              = "kube-vip.io/forwardUPNP"

 	RPFilter = "kube-vip.io/rp_filter" // Set the return path filter for a specific service interface
-
-	ServiceLease = "kube-vip.io/leaseName"
 )
--- a/pkg/kubevip/config_environment.go
+++ b/pkg/kubevip/config_environment.go
@@ -6,12 +6,11 @@ import (
 	"math"
 	"math/bits"
 	"os"
-	"path/filepath"
 	"strconv"
 	"strings"

+	"github.com/kube-vip/kube-vip/pkg/bgp"
 	"github.com/kube-vip/kube-vip/pkg/detector"
-	"sigs.k8s.io/yaml"
 )

 // ParseEnvironment - will popultate the configuration from environment variables
@@ -291,21 +290,6 @@ func ParseEnvironment(c *Config) error {
 		c.ArpBroadcastRate = 3000
 	}

-	// Determine if VIP should be preserved on leadership loss
-	// true: VIP addresses remain on interface, only ARP/NDP broadcasting stops
-	// false (default): VIP addresses are deleted on leadership loss (legacy behavior)
-	env = os.Getenv(vipPreserveOnLeadershipLoss)
-	if env != "" {
-		b, err := strconv.ParseBool(env)
-		if err != nil {
-			return err
-		}
-		c.PreserveVIPOnLeadershipLoss = b
-	} else {
-		// Default to false for backward compatibility
-		c.PreserveVIPOnLeadershipLoss = false
-	}
-
 	// Wireguard Mode
 	env = os.Getenv(vipWireguard)
 	if env != "" {
@@ -438,7 +422,7 @@ func ParseEnvironment(c *Config) error {
 	// Peer AS
 	env = os.Getenv(bgpPeers)
 	if env != "" {
-		peers, err := ParseBGPPeerConfig(env)
+		peers, err := bgp.ParseBGPPeerConfig(env)
 		if err != nil {
 			return err
 		}
@@ -683,285 +667,5 @@ func ParseEnvironment(c *Config) error {
 		c.EgressClean = b
 	}

-	// check for configuration file path
-	env = os.Getenv(configFile)
-	if env != "" {
-		c.ConfigFile = env
-	}
-
 	return nil
 }
-
-// LoadConfigFromFile loads configuration from a JSON or YAML file
-func LoadConfigFromFile(configFilePath string) (*Config, error) {
-	if configFilePath == "" {
-		return nil, fmt.Errorf("config file path is empty")
-	}
-
-	// Check if file exists
-	if _, err := os.Stat(configFilePath); os.IsNotExist(err) {
-		return nil, fmt.Errorf("config file does not exist: %s", configFilePath)
-	}
-
-	// Read file content
-	data, err := os.ReadFile(configFilePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read config file %s: %v", configFilePath, err)
-	}
-
-	var config Config
-	ext := strings.ToLower(filepath.Ext(configFilePath))
-
-	switch ext {
-	case ".json":
-		err = json.Unmarshal(data, &config)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse JSON config file %s: %v", configFilePath, err)
-		}
-	case ".yaml", ".yml":
-		err = yaml.Unmarshal(data, &config)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse YAML config file %s: %v", configFilePath, err)
-		}
-	default:
-		return nil, fmt.Errorf("unsupported config file format %s. Supported formats: .json, .yaml, .yml", ext)
-	}
-
-	return &config, nil
-}
-
-// MergeConfigFromFile merges configuration loaded from file with existing config
-// Priority: command line flags > environment variables > config file
-func MergeConfigFromFile(c *Config, configFilePath string) error {
-	if configFilePath == "" {
-		return nil // No config file specified, nothing to merge
-	}
-
-	fileConfig, err := LoadConfigFromFile(configFilePath)
-	if err != nil {
-		return err
-	}
-
-	// Merge file config with existing config
-	// Only set values from file if they haven't been set by flags or env vars
-	mergeConfigValues(c, fileConfig)
-
-	return nil
-}
-
-// mergeConfigValues merges values from fileConfig into baseConfig
-// Only overwrites zero values in baseConfig
-func mergeConfigValues(baseConfig, fileConfig *Config) {
-	// Basic configuration
-	if baseConfig.Logging == 0 && fileConfig.Logging != 0 {
-		baseConfig.Logging = fileConfig.Logging
-	}
-
-	// Network configuration
-	if baseConfig.Interface == "" && fileConfig.Interface != "" {
-		baseConfig.Interface = fileConfig.Interface
-	}
-	if baseConfig.ServicesInterface == "" && fileConfig.ServicesInterface != "" {
-		baseConfig.ServicesInterface = fileConfig.ServicesInterface
-	}
-	if baseConfig.VIP == "" && fileConfig.VIP != "" {
-		baseConfig.VIP = fileConfig.VIP
-	}
-	if baseConfig.VIPSubnet == "" && fileConfig.VIPSubnet != "" {
-		baseConfig.VIPSubnet = fileConfig.VIPSubnet
-	}
-	if baseConfig.Address == "" && fileConfig.Address != "" {
-		baseConfig.Address = fileConfig.Address
-	}
-	if baseConfig.Port == 0 && fileConfig.Port != 0 {
-		baseConfig.Port = fileConfig.Port
-	}
-	if baseConfig.NodeName == "" && fileConfig.NodeName != "" {
-		baseConfig.NodeName = fileConfig.NodeName
-	}
-
-	// Boolean flags - only merge if not explicitly set
-	if !baseConfig.EnableARP && fileConfig.EnableARP {
-		baseConfig.EnableARP = fileConfig.EnableARP
-	}
-	if !baseConfig.EnableBGP && fileConfig.EnableBGP {
-		baseConfig.EnableBGP = fileConfig.EnableBGP
-	}
-	if !baseConfig.EnableWireguard && fileConfig.EnableWireguard {
-		baseConfig.EnableWireguard = fileConfig.EnableWireguard
-	}
-	if !baseConfig.EnableRoutingTable && fileConfig.EnableRoutingTable {
-		baseConfig.EnableRoutingTable = fileConfig.EnableRoutingTable
-	}
-	if !baseConfig.EnableControlPlane && fileConfig.EnableControlPlane {
-		baseConfig.EnableControlPlane = fileConfig.EnableControlPlane
-	}
-	if !baseConfig.DetectControlPlane && fileConfig.DetectControlPlane {
-		baseConfig.DetectControlPlane = fileConfig.DetectControlPlane
-	}
-	if !baseConfig.EnableServices && fileConfig.EnableServices {
-		baseConfig.EnableServices = fileConfig.EnableServices
-	}
-	if !baseConfig.EnableServicesElection && fileConfig.EnableServicesElection {
-		baseConfig.EnableServicesElection = fileConfig.EnableServicesElection
-	}
-	if !baseConfig.EnableNodeLabeling && fileConfig.EnableNodeLabeling {
-		baseConfig.EnableNodeLabeling = fileConfig.EnableNodeLabeling
-	}
-	if !baseConfig.EnableLoadBalancer && fileConfig.EnableLoadBalancer {
-		baseConfig.EnableLoadBalancer = fileConfig.EnableLoadBalancer
-	}
-	if !baseConfig.DDNS && fileConfig.DDNS {
-		baseConfig.DDNS = fileConfig.DDNS
-	}
-	if !baseConfig.SingleNode && fileConfig.SingleNode {
-		baseConfig.SingleNode = fileConfig.SingleNode
-	}
-	if !baseConfig.StartAsLeader && fileConfig.StartAsLeader {
-		baseConfig.StartAsLeader = fileConfig.StartAsLeader
-	}
-	if !baseConfig.PreserveVIPOnLeadershipLoss && fileConfig.PreserveVIPOnLeadershipLoss {
-		baseConfig.PreserveVIPOnLeadershipLoss = fileConfig.PreserveVIPOnLeadershipLoss
-	}
-
-	// Service configuration
-	if baseConfig.Namespace == "" && fileConfig.Namespace != "" {
-		baseConfig.Namespace = fileConfig.Namespace
-	}
-	if baseConfig.ServiceNamespace == "" && fileConfig.ServiceNamespace != "" {
-		baseConfig.ServiceNamespace = fileConfig.ServiceNamespace
-	}
-	if baseConfig.ServicesLeaseName == "" && fileConfig.ServicesLeaseName != "" {
-		baseConfig.ServicesLeaseName = fileConfig.ServicesLeaseName
-	}
-
-	// LoadBalancer configuration
-	if baseConfig.LoadBalancerPort == 0 && fileConfig.LoadBalancerPort != 0 {
-		baseConfig.LoadBalancerPort = fileConfig.LoadBalancerPort
-	}
-	if baseConfig.LoadBalancerForwardingMethod == "" && fileConfig.LoadBalancerForwardingMethod != "" {
-		baseConfig.LoadBalancerForwardingMethod = fileConfig.LoadBalancerForwardingMethod
-	}
-	if baseConfig.LoadBalancerClassName == "" && fileConfig.LoadBalancerClassName != "" {
-		baseConfig.LoadBalancerClassName = fileConfig.LoadBalancerClassName
-	}
-
-	// Routing Table configuration
-	if baseConfig.RoutingTableID == 0 && fileConfig.RoutingTableID != 0 {
-		baseConfig.RoutingTableID = fileConfig.RoutingTableID
-	}
-	if baseConfig.RoutingTableType == 0 && fileConfig.RoutingTableType != 0 {
-		baseConfig.RoutingTableType = fileConfig.RoutingTableType
-	}
-	if baseConfig.RoutingProtocol == 0 && fileConfig.RoutingProtocol != 0 {
-		baseConfig.RoutingProtocol = fileConfig.RoutingProtocol
-	}
-
-	// BGP configuration
-	mergeBGPConfig(&baseConfig.BGPConfig, &fileConfig.BGPConfig)
-
-	// Kubernetes configuration
-	if baseConfig.K8sConfigFile == "" && fileConfig.K8sConfigFile != "" {
-		baseConfig.K8sConfigFile = fileConfig.K8sConfigFile
-	}
-
-	// Leader Election configuration
-	mergeLeaderElectionConfig(&baseConfig.KubernetesLeaderElection, &fileConfig.KubernetesLeaderElection)
-
-	// Prometheus configuration
-	if baseConfig.PrometheusHTTPServer == "" && fileConfig.PrometheusHTTPServer != "" {
-		baseConfig.PrometheusHTTPServer = fileConfig.PrometheusHTTPServer
-	}
-
-	// DNS configuration
-	if baseConfig.DNSMode == "" && fileConfig.DNSMode != "" {
-		baseConfig.DNSMode = fileConfig.DNSMode
-	}
-
-	// Health check configuration
-	if baseConfig.HealthCheckPort == 0 && fileConfig.HealthCheckPort != 0 {
-		baseConfig.HealthCheckPort = fileConfig.HealthCheckPort
-	}
-
-	// Egress configuration
-	if baseConfig.EgressPodCidr == "" && fileConfig.EgressPodCidr != "" {
-		baseConfig.EgressPodCidr = fileConfig.EgressPodCidr
-	}
-	if baseConfig.EgressServiceCidr == "" && fileConfig.EgressServiceCidr != "" {
-		baseConfig.EgressServiceCidr = fileConfig.EgressServiceCidr
-	}
-
-	// Mirror configuration
-	if baseConfig.MirrorDestInterface == "" && fileConfig.MirrorDestInterface != "" {
-		baseConfig.MirrorDestInterface = fileConfig.MirrorDestInterface
-	}
-
-	// Iptables configuration
-	if baseConfig.IptablesBackend == "" && fileConfig.IptablesBackend != "" {
-		baseConfig.IptablesBackend = fileConfig.IptablesBackend
-	}
-
-	// Backend health check interval
-	if baseConfig.BackendHealthCheckInterval == 0 && fileConfig.BackendHealthCheckInterval != 0 {
-		baseConfig.BackendHealthCheckInterval = fileConfig.BackendHealthCheckInterval
-	}
-
-	// ARP broadcast rate
-	if baseConfig.ArpBroadcastRate == 0 && fileConfig.ArpBroadcastRate != 0 {
-		baseConfig.ArpBroadcastRate = fileConfig.ArpBroadcastRate
-	}
-
-	// Annotations
-	if baseConfig.Annotations == "" && fileConfig.Annotations != "" {
-		baseConfig.Annotations = fileConfig.Annotations
-	}
-
-	// Load balancers slice
-	if len(baseConfig.LoadBalancers) == 0 && len(fileConfig.LoadBalancers) > 0 {
-		baseConfig.LoadBalancers = fileConfig.LoadBalancers
-	}
-}
-
-// mergeBGPConfig merges BGP configuration
-func mergeBGPConfig(base, file *BGPConfig) {
-	if base.RouterID == "" && file.RouterID != "" {
-		base.RouterID = file.RouterID
-	}
-	if base.AS == 0 && file.AS != 0 {
-		base.AS = file.AS
-	}
-	if base.SourceIF == "" && file.SourceIF != "" {
-		base.SourceIF = file.SourceIF
-	}
-	if base.SourceIP == "" && file.SourceIP != "" {
-		base.SourceIP = file.SourceIP
-	}
-	if base.HoldTime == 0 && file.HoldTime != 0 {
-		base.HoldTime = file.HoldTime
-	}
-	if base.KeepaliveInterval == 0 && file.KeepaliveInterval != 0 {
-		base.KeepaliveInterval = file.KeepaliveInterval
-	}
-	if len(base.Peers) == 0 && len(file.Peers) > 0 {
-		base.Peers = file.Peers
-	}
-}
-
-// mergeLeaderElectionConfig merges leader election configuration
-func mergeLeaderElectionConfig(base, file *KubernetesLeaderElection) {
-	if base.LeaseName == "" && file.LeaseName != "" {
-		base.LeaseName = file.LeaseName
-	}
-	if base.LeaseDuration == 0 && file.LeaseDuration != 0 {
-		base.LeaseDuration = file.LeaseDuration
-	}
-	if base.RenewDeadline == 0 && file.RenewDeadline != 0 {
-		base.RenewDeadline = file.RenewDeadline
-	}
-	if base.RetryPeriod == 0 && file.RetryPeriod != 0 {
-		base.RetryPeriod = file.RetryPeriod
-	}
-	if len(base.LeaseAnnotations) == 0 && len(file.LeaseAnnotations) > 0 {
-		base.LeaseAnnotations = file.LeaseAnnotations
-	}
-}
--- a/pkg/kubevip/config_envvar.go
+++ b/pkg/kubevip/config_envvar.go
@@ -9,9 +9,6 @@ const (
 	// vip_arpRate - defines the rate of gARP broadcasts
 	vipArpRate = "vip_arpRate"

-	// vipPreserveOnLeadershipLoss - if true, VIP addresses will remain on interface when leadership is lost
-	vipPreserveOnLeadershipLoss = "vip_preserve_on_leadership_loss"
-
 	// vipLeaderElection - defines if the kubernetes algorithm should be used
 	vipLeaderElection = "vip_leaderelection"

@@ -237,7 +234,4 @@ const (

 	// egressClean enables egress cleaning on kube-vip's start
 	egressClean = "egress_clean"
-
-	// configFile defines the path to a JSON/YAML configuration file
-	configFile = "config_file"
 )
--- a/pkg/kubevip/config_file_test.go
+++ b/pkg/kubevip/config_file_test.go
@@ -1,559 +0,0 @@
-package kubevip
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestLoadConfigFromFile(t *testing.T) {
-	// Create temporary directory for test files
-	tmpDir, err := os.MkdirTemp("", "kube-vip-config-test")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	tests := []struct {
-		name           string
-		filename       string
-		content        string
-		expectedConfig *Config
-		wantErr        bool
-		errContains    string
-	}{
-		{
-			name:     "Valid YAML config",
-			filename: "config.yaml",
-			content: `
-logging: 2
-enableARP: true
-enableControlPlane: true
-enableServices: true
-address: "192.168.1.100"
-port: 6443
-interface: "eth0"
-namespace: "kube-system"
-vipSubnet: "192.168.1.0/24"
-leaseName: "test-lease"
-leaseDuration: 15
-renewDeadline: 10
-retryPeriod: 2
-prometheusHTTPServer: ":2112"
-`,
-			expectedConfig: &Config{
-				Logging:              2,
-				EnableARP:            true,
-				EnableControlPlane:   true,
-				EnableServices:       true,
-				Address:              "192.168.1.100",
-				Port:                 6443,
-				Interface:            "eth0",
-				Namespace:            "kube-system",
-				VIPSubnet:            "192.168.1.0/24",
-				PrometheusHTTPServer: ":2112",
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName:     "test-lease",
-					LeaseDuration: 15,
-					RenewDeadline: 10,
-					RetryPeriod:   2,
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name:     "Valid JSON config",
-			filename: "config.json",
-			content: `{
-  "logging": 3,
-  "enableBGP": true,
-  "enableServices": true,
-  "address": "10.0.0.100",
-  "port": 8443,
-  "interface": "ens192",
-  "namespace": "kube-system",
-  "loadBalancers": [
-    {
-      "name": "control-plane",
-      "ports": [
-        {
-          "type": "TCP",
-          "port": 6443
-        }
-      ],
-      "bindToVip": true,
-      "forwardingMethod": "local"
-    }
-  ]
-}`,
-			expectedConfig: &Config{
-				Logging:        3,
-				EnableBGP:      true,
-				EnableServices: true,
-				Address:        "10.0.0.100",
-				Port:           8443,
-				Interface:      "ens192",
-				Namespace:      "kube-system",
-				LoadBalancers: []LoadBalancer{
-					{
-						Name: "control-plane",
-						Ports: []Port{
-							{
-								Type: "TCP",
-								Port: 6443,
-							},
-						},
-						BindToVip:        true,
-						ForwardingMethod: "local",
-					},
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name:     "Complex BGP config",
-			filename: "bgp-config.yaml",
-			content: `
-enableBGP: true
-bgpConfig:
-  routerID: "192.168.1.1"
-  as: 65000
-  sourceIF: "eth0"
-  holdTime: 60
-  keepaliveInterval: 20
-  peers:
-    - address: "192.168.1.2"
-      as: 65001
-      port: 179
-      multiHop: false
-    - address: "192.168.1.3"
-      as: 65002
-      port: 179
-      multiHop: true
-`,
-			expectedConfig: &Config{
-				EnableBGP: true,
-				BGPConfig: BGPConfig{
-					RouterID:          "192.168.1.1",
-					AS:                65000,
-					SourceIF:          "eth0",
-					HoldTime:          60,
-					KeepaliveInterval: 20,
-					Peers: []BGPPeer{
-						{
-							Address:  "192.168.1.2",
-							AS:       65001,
-							Port:     179,
-							MultiHop: false,
-						},
-						{
-							Address:  "192.168.1.3",
-							AS:       65002,
-							Port:     179,
-							MultiHop: true,
-						},
-					},
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name:        "Invalid JSON",
-			filename:    "invalid.json",
-			content:     `{"logging": 2, "invalid": }`,
-			wantErr:     true,
-			errContains: "failed to parse JSON config file",
-		},
-		{
-			name:        "Invalid YAML",
-			filename:    "invalid.yaml",
-			content:     "logging: 2\ninvalid: [unclosed",
-			wantErr:     true,
-			errContains: "failed to parse YAML config file",
-		},
-		{
-			name:        "Unsupported format",
-			filename:    "config.txt",
-			content:     "logging=2",
-			wantErr:     true,
-			errContains: "unsupported config file format",
-		},
-		{
-			name:        "Empty path",
-			filename:    "",
-			content:     "",
-			wantErr:     true,
-			errContains: "config file path is empty",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var filePath string
-			if tt.filename != "" {
-				filePath = filepath.Join(tmpDir, tt.filename)
-				if err := os.WriteFile(filePath, []byte(tt.content), 0600); err != nil {
-					t.Fatalf("Failed to write test file: %v", err)
-				}
-			}
-
-			config, err := LoadConfigFromFile(filePath)
-
-			if tt.wantErr {
-				if err == nil {
-					t.Errorf("LoadConfigFromFile() expected error, got nil")
-					return
-				}
-				if tt.errContains != "" && !containsString(err.Error(), tt.errContains) {
-					t.Errorf("LoadConfigFromFile() error = %v, expected to contain %v", err, tt.errContains)
-				}
-				return
-			}
-
-			if err != nil {
-				t.Errorf("LoadConfigFromFile() unexpected error = %v", err)
-				return
-			}
-
-			if config == nil {
-				t.Errorf("LoadConfigFromFile() returned nil config")
-				return
-			}
-
-			// Compare key fields
-			if config.Logging != tt.expectedConfig.Logging {
-				t.Errorf("Logging = %v, expected %v", config.Logging, tt.expectedConfig.Logging)
-			}
-			if config.EnableARP != tt.expectedConfig.EnableARP {
-				t.Errorf("EnableARP = %v, expected %v", config.EnableARP, tt.expectedConfig.EnableARP)
-			}
-			if config.EnableBGP != tt.expectedConfig.EnableBGP {
-				t.Errorf("EnableBGP = %v, expected %v", config.EnableBGP, tt.expectedConfig.EnableBGP)
-			}
-			if config.Address != tt.expectedConfig.Address {
-				t.Errorf("Address = %v, expected %v", config.Address, tt.expectedConfig.Address)
-			}
-			if config.Port != tt.expectedConfig.Port {
-				t.Errorf("Port = %v, expected %v", config.Port, tt.expectedConfig.Port)
-			}
-			if config.Interface != tt.expectedConfig.Interface {
-				t.Errorf("Interface = %v, expected %v", config.Interface, tt.expectedConfig.Interface)
-			}
-
-			// Test BGP config if present
-			if tt.expectedConfig.EnableBGP {
-				if config.BGPConfig.RouterID != tt.expectedConfig.BGPConfig.RouterID {
-					t.Errorf("BGPConfig.RouterID = %v, expected %v", config.BGPConfig.RouterID, tt.expectedConfig.BGPConfig.RouterID)
-				}
-				if config.BGPConfig.AS != tt.expectedConfig.BGPConfig.AS {
-					t.Errorf("BGPConfig.AS = %v, expected %v", config.BGPConfig.AS, tt.expectedConfig.BGPConfig.AS)
-				}
-				if len(config.BGPConfig.Peers) != len(tt.expectedConfig.BGPConfig.Peers) {
-					t.Errorf("BGPConfig.Peers length = %v, expected %v", len(config.BGPConfig.Peers), len(tt.expectedConfig.BGPConfig.Peers))
-				}
-			}
-
-			// Test LoadBalancers if present
-			if len(tt.expectedConfig.LoadBalancers) > 0 {
-				if len(config.LoadBalancers) != len(tt.expectedConfig.LoadBalancers) {
-					t.Errorf("LoadBalancers length = %v, expected %v", len(config.LoadBalancers), len(tt.expectedConfig.LoadBalancers))
-				}
-			}
-		})
-	}
-}
-
-func TestMergeConfigFromFile(t *testing.T) {
-	// Create temporary directory for test files
-	tmpDir, err := os.MkdirTemp("", "kube-vip-merge-test")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	// Create test config file
-	configFile := filepath.Join(tmpDir, "test-config.yaml")
-	configContent := `
-logging: 3
-enableARP: true
-enableServices: true
-address: "192.168.1.200"
-port: 6443
-interface: "eth1"
-namespace: "test-namespace"
-leaseName: "file-lease"
-leaseDuration: 20
-prometheusHTTPServer: ":3000"
-`
-	if err := os.WriteFile(configFile, []byte(configContent), 0600); err != nil {
-		t.Fatalf("Failed to write test config file: %v", err)
-	}
-
-	tests := []struct {
-		name           string
-		baseConfig     *Config
-		configFilePath string
-		expected       *Config
-		wantErr        bool
-	}{
-		{
-			name:           "Merge with empty base config",
-			baseConfig:     &Config{},
-			configFilePath: configFile,
-			expected: &Config{
-				Logging:              3,
-				EnableARP:            true,
-				EnableServices:       true,
-				Address:              "192.168.1.200",
-				Port:                 6443,
-				Interface:            "eth1",
-				Namespace:            "test-namespace",
-				PrometheusHTTPServer: ":3000",
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName:     "file-lease",
-					LeaseDuration: 20,
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name: "Merge respects existing values (priority test)",
-			baseConfig: &Config{
-				Logging:   5,      // Should not be overridden
-				Port:      8443,   // Should not be overridden
-				Interface: "eth0", // Should not be overridden
-			},
-			configFilePath: configFile,
-			expected: &Config{
-				Logging:              5,                // From base (higher priority)
-				EnableARP:            true,             // From file
-				EnableServices:       true,             // From file
-				Address:              "192.168.1.200",  // From file
-				Port:                 8443,             // From base (higher priority)
-				Interface:            "eth0",           // From base (higher priority)
-				Namespace:            "test-namespace", // From file
-				PrometheusHTTPServer: ":3000",          // From file
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName:     "file-lease", // From file
-					LeaseDuration: 20,           // From file
-				},
-			},
-			wantErr: false,
-		},
-		{
-			name: "Empty config file path",
-			baseConfig: &Config{
-				Logging: 1,
-			},
-			configFilePath: "",
-			expected: &Config{
-				Logging: 1, // Unchanged
-			},
-			wantErr: false,
-		},
-		{
-			name: "Non-existent config file",
-			baseConfig: &Config{
-				Logging: 1,
-			},
-			configFilePath: "/non/existent/file.yaml",
-			expected: &Config{
-				Logging: 1,
-			},
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := MergeConfigFromFile(tt.baseConfig, tt.configFilePath)
-
-			if tt.wantErr {
-				if err == nil {
-					t.Errorf("MergeConfigFromFile() expected error, got nil")
-				}
-				return
-			}
-
-			if err != nil {
-				t.Errorf("MergeConfigFromFile() unexpected error = %v", err)
-				return
-			}
-
-			// Compare key fields
-			if tt.baseConfig.Logging != tt.expected.Logging {
-				t.Errorf("Logging = %v, expected %v", tt.baseConfig.Logging, tt.expected.Logging)
-			}
-			if tt.baseConfig.EnableARP != tt.expected.EnableARP {
-				t.Errorf("EnableARP = %v, expected %v", tt.baseConfig.EnableARP, tt.expected.EnableARP)
-			}
-			if tt.baseConfig.Address != tt.expected.Address {
-				t.Errorf("Address = %v, expected %v", tt.baseConfig.Address, tt.expected.Address)
-			}
-			if tt.baseConfig.Port != tt.expected.Port {
-				t.Errorf("Port = %v, expected %v", tt.baseConfig.Port, tt.expected.Port)
-			}
-			if tt.baseConfig.Interface != tt.expected.Interface {
-				t.Errorf("Interface = %v, expected %v", tt.baseConfig.Interface, tt.expected.Interface)
-			}
-			if tt.baseConfig.Namespace != tt.expected.Namespace {
-				t.Errorf("Namespace = %v, expected %v", tt.baseConfig.Namespace, tt.expected.Namespace)
-			}
-			if tt.baseConfig.PrometheusHTTPServer != tt.expected.PrometheusHTTPServer {
-				t.Errorf("PrometheusHTTPServer = %v, expected %v", tt.baseConfig.PrometheusHTTPServer, tt.expected.PrometheusHTTPServer)
-			}
-		})
-	}
-}
-
-func TestMergeConfigValues(t *testing.T) {
-	tests := []struct {
-		name         string
-		baseConfig   *Config
-		fileConfig   *Config
-		expectedBase *Config
-	}{
-		{
-			name: "Merge basic configuration",
-			baseConfig: &Config{
-				Logging: 5, // Should not be overridden
-				Port:    0, // Should be overridden
-			},
-			fileConfig: &Config{
-				Logging:   2,
-				Port:      6443,
-				Interface: "eth0",
-				Address:   "192.168.1.100",
-			},
-			expectedBase: &Config{
-				Logging:   5,               // From base (non-zero)
-				Port:      6443,            // From file (base was zero)
-				Interface: "eth0",          // From file (base was empty)
-				Address:   "192.168.1.100", // From file (base was empty)
-			},
-		},
-		{
-			name: "Merge boolean flags",
-			baseConfig: &Config{
-				EnableARP: true, // Should not be overridden
-			},
-			fileConfig: &Config{
-				EnableARP:       false, // Should not override true
-				EnableBGP:       true,  // Should be set
-				EnableServices:  true,  // Should be set
-				EnableWireguard: false, // Should not be set (false doesn't override false)
-			},
-			expectedBase: &Config{
-				EnableARP:       true,  // From base (true has priority)
-				EnableBGP:       true,  // From file
-				EnableServices:  true,  // From file
-				EnableWireguard: false, // Remains false
-			},
-		},
-		{
-			name: "Merge BGP configuration",
-			baseConfig: &Config{
-				BGPConfig: BGPConfig{
-					RouterID: "1.1.1.1", // Should not be overridden
-				},
-			},
-			fileConfig: &Config{
-				BGPConfig: BGPConfig{
-					RouterID:          "2.2.2.2", // Should not override
-					AS:                65000,     // Should be set
-					SourceIF:          "eth0",    // Should be set
-					HoldTime:          30,        // Should be set
-					KeepaliveInterval: 10,        // Should be set
-				},
-			},
-			expectedBase: &Config{
-				BGPConfig: BGPConfig{
-					RouterID:          "1.1.1.1", // From base (non-empty)
-					AS:                65000,     // From file (base was zero)
-					SourceIF:          "eth0",    // From file (base was empty)
-					HoldTime:          30,        // From file (base was zero)
-					KeepaliveInterval: 10,        // From file (base was zero)
-				},
-			},
-		},
-		{
-			name: "Merge leader election configuration",
-			baseConfig: &Config{
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName: "base-lease", // Should not be overridden
-				},
-			},
-			fileConfig: &Config{
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName:     "file-lease", // Should not override
-					LeaseDuration: 15,           // Should be set
-					RenewDeadline: 10,           // Should be set
-					RetryPeriod:   2,            // Should be set
-				},
-			},
-			expectedBase: &Config{
-				KubernetesLeaderElection: KubernetesLeaderElection{
-					LeaseName:     "base-lease", // From base (non-empty)
-					LeaseDuration: 15,           // From file (base was zero)
-					RenewDeadline: 10,           // From file (base was zero)
-					RetryPeriod:   2,            // From file (base was zero)
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			mergeConfigValues(tt.baseConfig, tt.fileConfig)
-
-			// Compare results
-			if tt.baseConfig.Logging != tt.expectedBase.Logging {
-				t.Errorf("Logging = %v, expected %v", tt.baseConfig.Logging, tt.expectedBase.Logging)
-			}
-			if tt.baseConfig.Port != tt.expectedBase.Port {
-				t.Errorf("Port = %v, expected %v", tt.baseConfig.Port, tt.expectedBase.Port)
-			}
-			if tt.baseConfig.Interface != tt.expectedBase.Interface {
-				t.Errorf("Interface = %v, expected %v", tt.baseConfig.Interface, tt.expectedBase.Interface)
-			}
-			if tt.baseConfig.EnableARP != tt.expectedBase.EnableARP {
-				t.Errorf("EnableARP = %v, expected %v", tt.baseConfig.EnableARP, tt.expectedBase.EnableARP)
-			}
-			if tt.baseConfig.EnableBGP != tt.expectedBase.EnableBGP {
-				t.Errorf("EnableBGP = %v, expected %v", tt.baseConfig.EnableBGP, tt.expectedBase.EnableBGP)
-			}
-			if tt.baseConfig.BGPConfig.RouterID != tt.expectedBase.BGPConfig.RouterID {
-				t.Errorf("BGPConfig.RouterID = %v, expected %v", tt.baseConfig.BGPConfig.RouterID, tt.expectedBase.BGPConfig.RouterID)
-			}
-			if tt.baseConfig.BGPConfig.AS != tt.expectedBase.BGPConfig.AS {
-				t.Errorf("BGPConfig.AS = %v, expected %v", tt.baseConfig.BGPConfig.AS, tt.expectedBase.BGPConfig.AS)
-			}
-			if tt.baseConfig.KubernetesLeaderElection.LeaseName != tt.expectedBase.KubernetesLeaderElection.LeaseName {
-				t.Errorf("KubernetesLeaderElection.LeaseName = %v, expected %v", tt.baseConfig.KubernetesLeaderElection.LeaseName, tt.expectedBase.KubernetesLeaderElection.LeaseName)
-			}
-		})
-	}
-}
-
-func TestLoadConfigFromFile_FileNotExists(t *testing.T) {
-	_, err := LoadConfigFromFile("/non/existent/path/config.yaml")
-	if err == nil {
-		t.Error("LoadConfigFromFile() expected error for non-existent file, got nil")
-	}
-	if !containsString(err.Error(), "config file does not exist") {
-		t.Errorf("LoadConfigFromFile() error = %v, expected to contain 'config file does not exist'", err)
-	}
-}
-
-// Helper function to check if a string contains a substring
-func containsString(str, substr string) bool {
-	return len(str) >= len(substr) && (str == substr || len(substr) == 0 ||
-		(len(substr) > 0 && func() bool {
-			for i := 0; i <= len(str)-len(substr); i++ {
-				if str[i:i+len(substr)] == substr {
-					return true
-				}
-			}
-			return false
-		}()))
-}
--- a/pkg/kubevip/config_generator.go
+++ b/pkg/kubevip/config_generator.go
@@ -5,7 +5,6 @@ import (
 	"log"
 	"strconv"

-	"github.com/google/go-containerregistry/pkg/name"
 	appv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -14,6 +13,7 @@ import (
 	applyCoreV1 "k8s.io/client-go/applyconfigurations/core/v1"
 	applyMetaV1 "k8s.io/client-go/applyconfigurations/meta/v1"
 	applyRbacV1 "k8s.io/client-go/applyconfigurations/rbac/v1"
+
 	"sigs.k8s.io/yaml"
 )

@@ -167,11 +167,7 @@ func GenerateRoleBinding(rolebinding bool, saCfg *applyCoreV1.ServiceAccountAppl
 }

 // generatePodSpec will take a kube-vip config and generate a Pod spec
-func generatePodSpec(c *Config, image, imageVersion string, inCluster bool) *corev1.Pod {
-	imageRef, err := name.NewTag(image, name.WeakValidation, name.WithDefaultTag(imageVersion))
-	if err != nil {
-		panic(fmt.Errorf("Cannot parse %q: %w", image, err))
-	}
+func generatePodSpec(c *Config, imageVersion string, inCluster bool) *corev1.Pod {
 	command := "manager"

 	// Determine where the pods should be living (for multi-tenancy)
@@ -596,7 +592,7 @@ func generatePodSpec(c *Config, image, imageVersion string, inCluster bool) *cor
 			Containers: []corev1.Container{
 				{
 					Name:            "kube-vip",
-					Image:           imageRef.Name(),
+					Image:           fmt.Sprintf("ghcr.io/kube-vip/kube-vip:%s", imageVersion),
 					ImagePullPolicy: corev1.PullIfNotPresent,
 					SecurityContext: securityContext,
 					Args: []string{
@@ -641,14 +637,14 @@ func generatePodSpec(c *Config, image, imageVersion string, inCluster bool) *cor
 }

 // GeneratePodManifestFromConfig will take a kube-vip config and generate a manifest
-func GeneratePodManifestFromConfig(c *Config, image, imageVersion string, inCluster bool) string {
-	newManifest := generatePodSpec(c, image, imageVersion, inCluster)
+func GeneratePodManifestFromConfig(c *Config, imageVersion string, inCluster bool) string {
+	newManifest := generatePodSpec(c, imageVersion, inCluster)
 	b, _ := yaml.Marshal(newManifest)
 	return string(b)
 }

 // GenerateDaemonsetManifestFromConfig will take a kube-vip config and generate a manifest
-func GenerateDaemonsetManifestFromConfig(c *Config, image, imageVersion string, inCluster, taint bool) string {
+func GenerateDaemonsetManifestFromConfig(c *Config, imageVersion string, inCluster, taint bool) string {
 	// Determine where the pod should be deployed
 	var namespace string
 	if c.ServiceNamespace != "" {
@@ -657,7 +653,7 @@ func GenerateDaemonsetManifestFromConfig(c *Config, image, imageVersion string,
 		namespace = metav1.NamespaceSystem
 	}

-	podSpec := generatePodSpec(c, image, imageVersion, inCluster).Spec
+	podSpec := generatePodSpec(c, imageVersion, inCluster).Spec
 	newManifest := &appv1.DaemonSet{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "DaemonSet",
--- a/pkg/kubevip/config_generator_test.go
+++ b/pkg/kubevip/config_generator_test.go
@@ -1,9 +1,6 @@
 package kubevip

-import (
-	"os"
-	"testing"
-)
+import "testing"

 func TestParseEnvironment(t *testing.T) {

@@ -12,8 +9,8 @@ func TestParseEnvironment(t *testing.T) {
 		c       *Config
 		wantErr bool
 	}{
-		{"nil config", nil, false},
-		{"basic config", &Config{Interface: "eth0", ServicesInterface: "eth1"}, false},
+		{"", nil, false},
+		{"", &Config{Interface: "eth0", ServicesInterface: "eth1"}, false},
 	}
 	for _, tt := range tests {
 		t.Logf("%v", tt.c)
@@ -24,53 +21,3 @@ func TestParseEnvironment(t *testing.T) {
 		})
 	}
 }
-
-func TestParseEnvironmentConfigFile(t *testing.T) {
-	// Save original environment
-	originalConfigFile := os.Getenv("config_file")
-	defer func() {
-		if originalConfigFile != "" {
-			os.Setenv("config_file", originalConfigFile)
-		} else {
-			os.Unsetenv("config_file")
-		}
-	}()
-
-	tests := []struct {
-		name           string
-		envValue       string
-		expectedConfig string
-	}{
-		{
-			name:           "config_file environment variable set",
-			envValue:       "/etc/kube-vip/config.yaml",
-			expectedConfig: "/etc/kube-vip/config.yaml",
-		},
-		{
-			name:           "config_file environment variable empty",
-			envValue:       "",
-			expectedConfig: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Set environment variable
-			if tt.envValue != "" {
-				os.Setenv("config_file", tt.envValue)
-			} else {
-				os.Unsetenv("config_file")
-			}
-
-			config := &Config{}
-			err := ParseEnvironment(config)
-			if err != nil {
-				t.Errorf("ParseEnvironment() unexpected error = %v", err)
-			}
-
-			if config.ConfigFile != tt.expectedConfig {
-				t.Errorf("ConfigFile = %v, expected %v", config.ConfigFile, tt.expectedConfig)
-			}
-		})
-	}
-}
--- a/pkg/kubevip/config_types.go
+++ b/pkg/kubevip/config_types.go
@@ -1,5 +1,9 @@
 package kubevip

+import (
+	"github.com/kube-vip/kube-vip/pkg/bgp"
+)
+
 // Config defines all of the settings for the Kube-Vip Pod
 type Config struct {
 	// Logging, settings
@@ -50,10 +54,6 @@ type Config struct {
 	// ArpBroadcastRate, defines how often kube-vip will update the network about updates to the network
 	ArpBroadcastRate int64 `yaml:"arpBroadcastRate"`

-	// PreserveVIPOnLeadershipLoss, if true, VIP addresses will remain on interface when leadership is lost (only ARP/NDP broadcasting stops)
-	// If false, VIP addresses are deleted on leadership loss (legacy behavior)
-	PreserveVIPOnLeadershipLoss bool `yaml:"preserveVipOnLeadershipLoss"`
-
 	// Annotations will define if we're going to wait and lookup configuration from Kubernetes node annotations
 	Annotations string

@@ -128,8 +128,8 @@ type Config struct {
 	CleanRoutingTable bool `yaml:"cleanRoutingTable"`

 	// BGP Configuration
-	BGPConfig     BGPConfig
-	BGPPeerConfig BGPPeer
+	BGPConfig     bgp.Config
+	BGPPeerConfig bgp.Peer
 	BGPPeers      []string

 	// LoadBalancers are the various services we can load balance over
@@ -186,9 +186,6 @@ type Config struct {

 	// EgressClean, enables egress cleaning on Kube-vip's start
 	EgressClean bool `yaml:"egressClean"`
-
-	// ConfigFile defines the path to a JSON/YAML configuration file
-	ConfigFile string `yaml:"configFile"`
 }

 // KubernetesLeaderElection defines all of the settings for Kubernetes KubernetesLeaderElection
--- a/pkg/kubevip/constants.go
+++ b/pkg/kubevip/constants.go
@@ -1,5 +0,0 @@
-package kubevip
-
-const (
-	LBClassName = "kube-vip.io/kube-vip-class"
-)
--- a/pkg/kubevip/labels.go
+++ b/pkg/kubevip/labels.go
@@ -1,7 +0,0 @@
-package kubevip
-
-const (
-	// label used on nodes, which announce the LoadBalancer IP
-	HasIP         = "kube-vip.io/has-ip"
-	HasIPJSONPath = `kube-vip.io~1has-ip`
-)
--- a/pkg/lease/lease.go
+++ b/pkg/lease/lease.go
@@ -1,127 +0,0 @@
-package lease
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	v1 "k8s.io/api/core/v1"
-)
-
-// Manager is used to manage leases.
-type Manager struct {
-	leases map[string]*Lease
-	lock   sync.Mutex
-}
-
-// NewManager creates new lease manager.
-func NewManager() *Manager {
-	return &Manager{
-		leases: make(map[string]*Lease),
-	}
-}
-
-// Add adds lease or incerements counter if lease is alreay used.
-func (m *Manager) Add(service *v1.Service) (*Lease, bool) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	_, id := GetName(service)
-	if _, exist := m.leases[id]; !exist {
-		ctx, cancel := context.WithCancel(context.Background())
-		m.leases[id] = newLease(ctx, cancel)
-		return m.leases[id], true
-	}
-
-	m.leases[id].increment()
-	return m.leases[id], false
-}
-
-// Delete decrements lease counter and removes the lease if counter equals 0.
-func (m *Manager) Delete(service *v1.Service) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	_, id := GetName(service)
-	if _, exist := m.leases[id]; exist {
-		m.leases[id].decrement()
-		if m.leases[id].cnt < 1 {
-			delete(m.leases, id)
-		}
-	}
-}
-
-// Get returns lease for the service.
-func (m *Manager) Get(service *v1.Service) *Lease {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	_, id := GetName(service)
-
-	if lease, exist := m.leases[id]; exist {
-		return lease
-	}
-	return nil
-}
-
-// GetLeaderContext returns leder context for the service.
-func (m *Manager) GetLeaderContext(service *v1.Service) context.Context {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	_, id := GetName(service)
-	if _, ok := m.leases[id]; !ok {
-		return nil
-	}
-	return m.leases[id].Ctx
-}
-
-// Lease holds lease data.
-type Lease struct {
-	cnt     uint
-	Lock    *sync.Mutex
-	Ctx     context.Context
-	Cancel  context.CancelFunc
-	Started chan any
-}
-
-func newLease(ctx context.Context, cancel context.CancelFunc) *Lease {
-	return &Lease{
-		Ctx:     ctx,
-		Cancel:  cancel,
-		cnt:     1,
-		Lock:    new(sync.Mutex),
-		Started: make(chan any),
-	}
-}
-
-func (l *Lease) increment() {
-	l.Lock.Lock()
-	defer l.Lock.Unlock()
-	l.cnt++
-}
-
-func (l *Lease) decrement() {
-	l.Lock.Lock()
-	defer l.Lock.Unlock()
-	if l.cnt == 0 {
-		return
-	}
-	l.cnt--
-	if l.cnt < 1 {
-		l.Cancel()
-	}
-}
-
-// GetName gets lease name and id for the service.
-func GetName(service *v1.Service) (string, string) {
-	serviceLease, exists := service.Annotations[kubevip.ServiceLease]
-	if !exists || serviceLease == "" {
-		serviceLease = fmt.Sprintf("kubevip-%s", service.Name)
-	}
-	serviceLeaseID := fmt.Sprintf("%s/%s", serviceLease, service.Namespace)
-	return serviceLease, serviceLeaseID
-}
-
-// UsesCommon checks if service uses common lease feature.
-func UsesCommon(service *v1.Service) bool {
-	_, common := service.Annotations[kubevip.ServiceLease]
-	return common
-}
--- a/pkg/loadbalancer/ipvs.go
+++ b/pkg/loadbalancer/ipvs.go
@@ -16,7 +16,7 @@ import (
 	"github.com/cloudflare/ipvs/netmask"
 	"github.com/kube-vip/kube-vip/pkg/backend"
 	"github.com/kube-vip/kube-vip/pkg/sysctl"
-	"github.com/kube-vip/kube-vip/pkg/utils"
+	"github.com/kube-vip/kube-vip/pkg/vip"
 	"github.com/vishvananda/netlink"
 )

@@ -358,7 +358,7 @@ func (lb *IPVSLoadBalancer) isLocal(address string) (bool, error) {
 	}

 	family := netlink.FAMILY_V6
-	if utils.IsIPv4(address) {
+	if vip.IsIPv4(address) {
 		family = netlink.FAMILY_V4
 	}

--- a/pkg/loadbalancer/ipvs_test.go
+++ b/pkg/loadbalancer/ipvs_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"

 	"github.com/cloudflare/ipvs"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 )

 func Test_ipAndFamily(t *testing.T) {
@@ -20,7 +19,7 @@ func Test_ipAndFamily(t *testing.T) {
 		want1 ipvs.AddressFamily
 	}{
 		{
-			name: utils.IPv4Family,
+			name: "IPv4",
 			args: args{
 				address: "192.168.0.20",
 			},
@@ -28,7 +27,7 @@ func Test_ipAndFamily(t *testing.T) {
 			want1: ipvs.INET,
 		},
 		{
-			name: utils.IPv6Family,
+			name: "IPv6",
 			args: args{
 				address: "ff02::3",
 			},
--- a/pkg/manager/manager.go
+++ b/pkg/manager/manager.go
@@ -19,7 +19,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/k8s"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/networkinterface"
-	"github.com/kube-vip/kube-vip/pkg/node"
 	"github.com/kube-vip/kube-vip/pkg/services"
 	"github.com/kube-vip/kube-vip/pkg/upnp"
 	"github.com/kube-vip/kube-vip/pkg/utils"
@@ -67,11 +66,6 @@ type Manager struct {

 	// This tracks VIPs and performs ARP/NDP advertisement.
 	arpMgr *arp.Manager
-
-	// This tracks node labels and performs label management
-	// implementation will be decided in constructor
-	// based on config.EnableNodeLabeling
-	nodeLabelManager node.LabelManager
 }

 // New will create a new managing object
@@ -193,19 +187,15 @@ func New(configMap string, config *kubevip.Config) (*Manager, error) {
 	intfMgr := networkinterface.NewManager()
 	arpMgr := arp.NewManager(config)

-	// create the node label manager
-	// constructor will decide if it should be a noop or not
-	nodeLabelManager := node.NewManager(config, clientset)
-
 	var bgpServer *bgp.Server
 	if config.EnableBGP {
-		bgpServer, err = bgp.NewBGPServer(config.BGPConfig)
+		bgpServer, err = bgp.NewBGPServer(&config.BGPConfig)
 		if err != nil {
 			return nil, fmt.Errorf("creating BGP server: %w", err)
 		}
 	}

-	svcProcessor := services.NewServicesProcessor(config, bgpServer, clientset, rwClientSet, shutdownChan, intfMgr, arpMgr, nodeLabelManager)
+	svcProcessor := services.NewServicesProcessor(config, bgpServer, clientset, rwClientSet, shutdownChan, intfMgr, arpMgr)

 	return &Manager{
 		clientSet:   clientset,
@@ -224,13 +214,12 @@ func New(configMap string, config *kubevip.Config) (*Manager, error) {
 			Name:      "bgp_session_info",
 			Help:      "Display state of session by setting metric for label value with current state to 1",
 		}, []string{"state", "peer"}),
-		signalChan:       signalChan,
-		shutdownChan:     shutdownChan,
-		svcProcessor:     svcProcessor,
-		intfMgr:          intfMgr,
-		arpMgr:           arpMgr,
-		bgpServer:        bgpServer,
-		nodeLabelManager: nodeLabelManager,
+		signalChan:   signalChan,
+		shutdownChan: shutdownChan,
+		svcProcessor: svcProcessor,
+		intfMgr:      intfMgr,
+		arpMgr:       arpMgr,
+		bgpServer:    bgpServer,
 	}, nil
 }

@@ -246,9 +235,6 @@ func (sm *Manager) Start() error {
 	// Add Notification for SIGTERM (sent from Kubernetes)
 	signal.Notify(sm.signalChan, syscall.SIGTERM)

-	// Add Notification for SIGUSR1 (for configuration dump)
-	signal.Notify(sm.signalChan, syscall.SIGUSR1)
-
 	// All watchers and other goroutines should have an additional goroutine that blocks on this, to shut things down
 	sm.shutdownChan = make(chan struct{})

@@ -272,13 +258,6 @@ func (sm *Manager) Start() error {
 		}()
 	}

-	// on exit, clean up the node labels
-	defer func() {
-		if err := sm.nodeLabelManager.CleanUpLabels(10 * time.Second); err != nil {
-			log.Error("CleanUpNodeLabels", "unable to cleanup node labels", err)
-		}
-	}()
-
 	// If BGP is enabled then we start a server instance that will broadcast VIPs
 	if sm.config.EnableBGP {

@@ -308,9 +287,9 @@ func (sm *Manager) Start() error {
 					log.Info("Found UPNP IGD2 Gateway address", "ip", ip)
 				}
 			}
-			// TODO: It would be nice to run the UPNP refresh only on the leader.
-			go sm.svcProcessor.RefreshUPNPForwards()
 		}
+		// TODO: It would be nice to run the UPNP refresh only on the leader.
+		go sm.svcProcessor.RefreshUPNPForwards()
 	}

 	// If ARP is enabled then we start a LeaderElection that will use ARP to advertise VIPs
--- a/pkg/manager/manager_arp.go
+++ b/pkg/manager/manager_arp.go
@@ -32,24 +32,15 @@ func (sm *Manager) startARP(id string) error {

 	// Shutdown function that will wait on this signal, unless we call it ourselves
 	go func() {
-		for {
-			sig := <-sm.signalChan
-			switch sig {
-			case syscall.SIGUSR1:
-				log.Info("Received SIGUSR1, dumping configuration")
-				sm.dumpConfiguration()
-			case syscall.SIGINT, syscall.SIGTERM:
-				log.Info("Received kube-vip termination, signaling shutdown")
-				if sm.config.EnableControlPlane {
-					cpCluster.Stop()
-				}
-				// Close all go routines
-				close(sm.shutdownChan)
-				// Cancel the context, which will in turn cancel the leadership
-				cancel()
-				return
-			}
+		<-sm.signalChan
+		log.Info("Received kube-vip termination, signaling shutdown")
+		if sm.config.EnableControlPlane {
+			cpCluster.Stop()
 		}
+		// Close all go routines
+		close(sm.shutdownChan)
+		// Cancel the context, which will in turn cancel the leadership
+		cancel()
 	}()

 	if sm.config.EnableControlPlane {
--- a/pkg/manager/manager_bgp.go
+++ b/pkg/manager/manager_bgp.go
@@ -20,7 +20,7 @@ func (sm *Manager) startBGP() error {
 	var err error

 	if sm.bgpServer == nil {
-		sm.bgpServer, err = bgp.NewBGPServer(sm.config.BGPConfig)
+		sm.bgpServer, err = bgp.NewBGPServer(&sm.config.BGPConfig)
 		if err != nil {
 			return fmt.Errorf("creating BGP server: %w", err)
 		}
@@ -61,24 +61,15 @@ func (sm *Manager) startBGP() error {

 	// Shutdown function that will wait on this signal, unless we call it ourselves
 	go func() {
-		for {
-			sig := <-sm.signalChan
-			switch sig {
-			case syscall.SIGUSR1:
-				log.Info("Received SIGUSR1, dumping configuration")
-				sm.dumpConfiguration()
-			case syscall.SIGINT, syscall.SIGTERM:
-				log.Info("Received termination, signaling shutdown")
-				if sm.config.EnableControlPlane {
-					if cpCluster != nil {
-						cpCluster.Stop()
-					}
-				}
-				// Cancel the context, which will in turn cancel the leadership
-				cancel()
-				return
+		<-sm.signalChan
+		log.Info("Received termination, signaling shutdown")
+		if sm.config.EnableControlPlane {
+			if cpCluster != nil {
+				cpCluster.Stop()
 			}
 		}
+		// Cancel the context, which will in turn cancel the leadership
+		cancel()
 	}()

 	if sm.config.EnableControlPlane {
@@ -114,18 +105,9 @@ func (sm *Manager) startBGP() error {
 		}
 	}

-	if sm.config.EnableServicesElection {
-		log.Info("beginning watching services, leaderelection will happen for every service")
-		err = sm.svcProcessor.StartServicesWatchForLeaderElection(ctx)
-		if err != nil {
-			return err
-		}
-	} else {
-		log.Info("beginning watching services without leader election")
-		err = sm.svcProcessor.ServicesWatcher(ctx, sm.svcProcessor.SyncServices)
-		if err != nil {
-			return err
-		}
+	err = sm.svcProcessor.ServicesWatcher(ctx, sm.svcProcessor.SyncServices)
+	if err != nil {
+		return err
 	}

 	log.Info("Shutting down Kube-Vip")
--- a/pkg/manager/manager_dump.go
+++ b/pkg/manager/manager_dump.go
@@ -1,235 +0,0 @@
-package manager
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"time"
-
-	"github.com/kube-vip/kube-vip/pkg/nftables"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// dumpConfiguration prints the current configuration to stdout when SIGUSR1 is received
-func (sm *Manager) dumpConfiguration() {
-	sm.mutex.Lock()
-	defer sm.mutex.Unlock()
-
-	fmt.Printf("\n")
-	fmt.Printf("================================================================================\n")
-	fmt.Printf("                   KUBE-VIP CONFIGURATION DUMP\n")
-	fmt.Printf("================================================================================\n")
-	fmt.Printf("Timestamp: %s\n", time.Now().Format(time.RFC3339))
-	fmt.Printf("Node Name: %s\n", sm.config.NodeName)
-	fmt.Printf("Process ID: %d\n", os.Getpid())
-	fmt.Printf("================================================================================\n")
-	fmt.Printf("\n")
-
-	sm.dumpConfigSection()
-	sm.dumpBGPSection()
-	sm.dumpARPSection()
-	sm.dumpServicesSection()
-	sm.dumpNetworkInterfacesSection()
-	sm.dumpLeaderElectionSection()
-	sm.dumpRuntimeSection()
-	sm.dumpNFTablesSection()
-	fmt.Printf("================================================================================\n")
-	fmt.Printf("                   END OF CONFIGURATION DUMP\n")
-	fmt.Printf("================================================================================\n")
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpConfigSection() {
-	fmt.Printf("--- BASIC CONFIGURATION ---\n")
-	fmt.Printf("VIP: %s\n", sm.config.Address)
-	fmt.Printf("VIP Subnet: %s\n", sm.config.VIPSubnet)
-	fmt.Printf("Port: %d\n", sm.config.Port)
-	fmt.Printf("Namespace: %s\n", sm.config.Namespace)
-	fmt.Printf("Service Namespace: %s\n", sm.config.ServiceNamespace)
-	fmt.Printf("Interface: %s\n", sm.config.Interface)
-	fmt.Printf("Services Interface: %s\n", sm.config.ServicesInterface)
-	fmt.Printf("Single Node Mode: %t\n", sm.config.SingleNode)
-	fmt.Printf("Start As Leader: %t\n", sm.config.StartAsLeader)
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpBGPSection() {
-	fmt.Printf("--- BGP CONFIGURATION ---\n")
-	fmt.Printf("BGP Enabled: %t\n", sm.config.EnableBGP)
-	if sm.config.EnableBGP {
-		fmt.Printf("BGP AS: %d\n", sm.config.BGPConfig.AS)
-		fmt.Printf("BGP Router ID: %s\n", sm.config.BGPConfig.RouterID)
-		fmt.Printf("BGP Source IP: %s\n", sm.config.BGPConfig.SourceIP)
-		fmt.Printf("BGP Source Interface: %s\n", sm.config.BGPConfig.SourceIF)
-		fmt.Printf("BGP Hold Time: %d\n", sm.config.BGPConfig.HoldTime)
-		fmt.Printf("BGP Keepalive Interval: %d\n", sm.config.BGPConfig.KeepaliveInterval)
-		fmt.Printf("BGP Peers: %d\n", len(sm.config.BGPConfig.Peers))
-		for i, peer := range sm.config.BGPConfig.Peers {
-			fmt.Printf("  Peer %d: %s:%d (AS: %d, MultiHop: %t)\n",
-				i+1, peer.Address, peer.Port, peer.AS, peer.MultiHop)
-		}
-	}
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpARPSection() {
-	fmt.Printf("--- ARP/NDP CONFIGURATION ---\n")
-	fmt.Printf("ARP Enabled: %t\n", sm.config.EnableARP)
-	if sm.config.EnableARP {
-		fmt.Printf("ARP Broadcast Rate: %d\n", sm.config.ArpBroadcastRate)
-	}
-	fmt.Printf("Wireguard Enabled: %t\n", sm.config.EnableWireguard)
-	fmt.Printf("Routing Table Enabled: %t\n", sm.config.EnableRoutingTable)
-	if sm.config.EnableRoutingTable {
-		fmt.Printf("Routing Table ID: %d\n", sm.config.RoutingTableID)
-		fmt.Printf("Routing Protocol: %d\n", sm.config.RoutingProtocol)
-		fmt.Printf("Clean Routing Table: %t\n", sm.config.CleanRoutingTable)
-	}
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpServicesSection() {
-	fmt.Printf("--- SERVICES CONFIGURATION ---\n")
-	fmt.Printf("Services Enabled: %t\n", sm.config.EnableServices)
-	if sm.config.EnableServices {
-		fmt.Printf("Services Election: %t\n", sm.config.EnableServicesElection)
-		fmt.Printf("Load Balancer Class Only: %t\n", sm.config.LoadBalancerClassOnly)
-		fmt.Printf("Load Balancer Class Name: %s\n", sm.config.LoadBalancerClassName)
-		fmt.Printf("Disable Service Updates: %t\n", sm.config.DisableServiceUpdates)
-		fmt.Printf("Enable Endpoints: %t\n", sm.config.EnableEndpoints)
-		fmt.Printf("Service Security Enabled: %t\n", sm.config.EnableServiceSecurity)
-
-		if sm.svcProcessor != nil {
-			instances := sm.svcProcessor.ServiceInstances
-			fmt.Printf("Kube-vip Active Service Instances: %d\n", len(instances))
-			for i, inst := range instances {
-				if inst.ServiceSnapshot != nil {
-					svc := inst.ServiceSnapshot
-					vipConfigs := ""
-					for j, cfg := range svc.Status.LoadBalancer.Ingress {
-						if j > 0 {
-							vipConfigs += ", "
-						}
-						vipConfigs += cfg.IP
-					}
-					fmt.Printf("  Service %d: %s/%s (Type: %s, VIPs: %s)\n",
-						i+1, svc.Namespace, svc.Name, svc.Spec.Type, vipConfigs)
-				}
-			}
-		}
-		if sm.clientSet != nil {
-			fmt.Println()
-			// Kubernetes configuration
-			fmt.Println("--- KUBERNETES CONFIGURATION (SERVICES/ENDPOINTSLICES) ---")
-
-			fmt.Println("Service Configuration:")
-			svcList, err := sm.clientSet.CoreV1().Services(v1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
-			if err != nil {
-				fmt.Println("Unable to retrieve all Services")
-			} else {
-				for x := range svcList.Items {
-
-					// Build all addresses
-					vipConfigs := ""
-					for j, cfg := range svcList.Items[x].Status.LoadBalancer.Ingress {
-						if j > 0 {
-							vipConfigs += ", "
-						}
-						vipConfigs += cfg.IP
-					}
-					fmt.Printf("Name=%s, UUID=%s, Addresses=%s\n", svcList.Items[x].Name, string(svcList.Items[x].UID), vipConfigs)
-				}
-				fmt.Println()
-			}
-
-			fmt.Println("EndpointSlice Configuration (note endpoint names have -XXXXX prefixed):")
-			epList, err := sm.clientSet.DiscoveryV1().EndpointSlices(v1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
-			if err != nil {
-				fmt.Println("Unable to retrieve all EndpointSlices")
-			} else {
-				for x := range epList.Items {
-					// Build all addresses
-					fmt.Printf("  Endpoint Slice Name: %s\n", epList.Items[x].Name)
-					for _, ep := range epList.Items[x].Endpoints {
-						endpoints := ""
-						for i, addresses := range ep.Addresses {
-							if i > 0 {
-								endpoints += ", "
-							}
-							endpoints += addresses
-						}
-						nodeName := "Unknown"
-						targetPod := "Unknown"
-						if ep.NodeName != nil {
-							nodeName = *ep.NodeName
-						}
-						if ep.TargetRef != nil {
-							targetPod = ep.TargetRef.Name
-						}
-						fmt.Printf("\tNode: %s, Target Pod:%s, Addresses: %s\n", nodeName, targetPod, endpoints)
-					}
-				}
-			}
-		}
-	}
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpNetworkInterfacesSection() {
-	fmt.Printf("--- NETWORK INTERFACES ---\n")
-	fmt.Printf("Network Interface Manager: %t\n", sm.intfMgr != nil)
-	fmt.Printf("ARP Manager: %t\n", sm.arpMgr != nil)
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpLeaderElectionSection() {
-	fmt.Printf("--- LEADER ELECTION CONFIGURATION ---\n")
-	fmt.Printf("Control Plane Enabled: %t\n", sm.config.EnableControlPlane)
-	if sm.config.EnableControlPlane {
-		fmt.Printf("Detect Control Plane: %t\n", sm.config.DetectControlPlane)
-	}
-	fmt.Printf("Leader Election Type: %s\n", sm.config.LeaderElectionType)
-	fmt.Printf("Leader Election Enabled: %t\n", sm.config.EnableLeaderElection)
-	if sm.config.EnableLeaderElection {
-		fmt.Printf("Lease Name: %s\n", sm.config.LeaseName)
-		fmt.Printf("Lease Duration: %d seconds\n", sm.config.LeaseDuration)
-		fmt.Printf("Renew Deadline: %d seconds\n", sm.config.RenewDeadline)
-		fmt.Printf("Retry Period: %d seconds\n", sm.config.RetryPeriod)
-	}
-	fmt.Printf("Services Lease Name: %s\n", sm.config.ServicesLeaseName)
-	fmt.Printf("Node Labeling Enabled: %t\n", sm.config.EnableNodeLabeling)
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpRuntimeSection() {
-	fmt.Printf("--- RUNTIME STATISTICS ---\n")
-	fmt.Printf("Load Balancer Enabled: %t\n", sm.config.EnableLoadBalancer)
-	if sm.config.EnableLoadBalancer {
-		fmt.Printf("Load Balancer Port: %d\n", sm.config.LoadBalancerPort)
-		fmt.Printf("Load Balancer Forwarding Method: %s\n", sm.config.LoadBalancerForwardingMethod)
-		fmt.Printf("Load Balancers Configured: %d\n", len(sm.config.LoadBalancers))
-	}
-	fmt.Printf("Prometheus HTTP Server: %s\n", sm.config.PrometheusHTTPServer)
-	fmt.Printf("Health Check Port: %d\n", sm.config.HealthCheckPort)
-	fmt.Printf("UPNP Enabled: %t\n", sm.config.EnableUPNP)
-	fmt.Printf("Egress Clean Enabled: %t\n", sm.config.EgressClean)
-	if sm.config.EgressClean {
-		fmt.Printf("Egress with nftables: %t\n", sm.config.EgressWithNftables)
-		fmt.Printf("Egress Pod CIDR: %s\n", sm.config.EgressPodCidr)
-		fmt.Printf("Egress Service CIDR: %s\n", sm.config.EgressServiceCidr)
-	}
-	fmt.Printf("\n")
-}
-
-func (sm *Manager) dumpNFTablesSection() {
-	fmt.Printf("--- NFTABLES CONFIGURATION ---\n")
-	chains, err := nftables.ListChains()
-	if err != nil {
-		fmt.Printf("Unable to retrieve NFTables chains, error=%s", err)
-	}
-	for x := range chains {
-		fmt.Printf("Chain: %s\n", chains[x])
-	}
-	fmt.Println()
-}
--- a/pkg/manager/manager_dump_test.go
+++ b/pkg/manager/manager_dump_test.go
@@ -1,238 +0,0 @@
-package manager
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"testing"
-
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestDumpConfiguration(t *testing.T) {
-	config := &kubevip.Config{
-		Address:            "192.168.1.100",
-		Interface:          "eth0",
-		Port:               6443,
-		EnableARP:          true,
-		EnableBGP:          false,
-		EnableControlPlane: true,
-		EnableServices:     true,
-		LeaderElectionType: "kubernetes",
-		Namespace:          "kube-system",
-		NodeName:           "test-node",
-		KubernetesLeaderElection: kubevip.KubernetesLeaderElection{
-			EnableLeaderElection: true,
-			LeaseName:            "test-lease",
-		},
-	}
-
-	mgr := &Manager{
-		config: config,
-	}
-
-	old := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	mgr.dumpConfiguration()
-
-	w.Close()
-	os.Stdout = old
-
-	var buf bytes.Buffer
-	_, err := io.Copy(&buf, r)
-	assert.NoError(t, err, "io.Copy should not return error")
-	output := buf.String()
-
-	assert.Contains(t, output, "KUBE-VIP CONFIGURATION DUMP", "should contain header")
-	assert.Contains(t, output, "Node Name: test-node", "should contain node name")
-	assert.Contains(t, output, "VIP: 192.168.1.100", "should contain VIP address")
-	assert.Contains(t, output, "Interface: eth0", "should contain interface")
-	assert.Contains(t, output, "Port: 6443", "should contain port")
-	assert.Contains(t, output, "ARP Enabled: true", "should contain ARP status")
-	assert.Contains(t, output, "BGP Enabled: false", "should contain BGP status")
-}
-
-func TestDumpConfigSection(t *testing.T) {
-	config := &kubevip.Config{
-		Address:            "192.168.1.100",
-		Interface:          "eth0",
-		Port:               6443,
-		VIPSubnet:          "/24",
-		EnableARP:          true,
-		EnableBGP:          false,
-		EnableControlPlane: true,
-		EnableServices:     true,
-		LeaderElectionType: "kubernetes",
-		Namespace:          "kube-system",
-		KubernetesLeaderElection: kubevip.KubernetesLeaderElection{
-			EnableLeaderElection: true,
-			LeaseName:            "test-lease",
-		},
-	}
-
-	mgr := &Manager{config: config}
-
-	old := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	mgr.dumpConfigSection()
-
-	w.Close()
-	os.Stdout = old
-
-	var buf bytes.Buffer
-	_, err := io.Copy(&buf, r)
-	assert.NoError(t, err, "io.Copy should not return error")
-	output := buf.String()
-
-	assert.Contains(t, output, "--- BASIC CONFIGURATION ---")
-	assert.Contains(t, output, "VIP: 192.168.1.100")
-	assert.Contains(t, output, "VIP Subnet: /24")
-	assert.Contains(t, output, "Interface: eth0")
-	assert.Contains(t, output, "Port: 6443")
-	assert.Contains(t, output, "Namespace: kube-system")
-	assert.Contains(t, output, "Single Node Mode: false")
-	assert.Contains(t, output, "Start As Leader: false")
-}
-
-func TestDumpBGPSection(t *testing.T) {
-	t.Run("BGP disabled", func(t *testing.T) {
-		config := &kubevip.Config{
-			EnableBGP: false,
-		}
-		mgr := &Manager{config: config}
-
-		old := os.Stdout
-		r, w, _ := os.Pipe()
-		os.Stdout = w
-
-		mgr.dumpBGPSection()
-
-		w.Close()
-		os.Stdout = old
-
-		var buf bytes.Buffer
-		_, err := io.Copy(&buf, r)
-		assert.NoError(t, err, "io.Copy should not return error")
-		output := buf.String()
-
-		assert.Contains(t, output, "BGP Enabled: false")
-	})
-
-	t.Run("BGP enabled", func(t *testing.T) {
-		config := &kubevip.Config{
-			EnableBGP: true,
-			BGPConfig: kubevip.BGPConfig{
-				RouterID: "192.168.1.1",
-				AS:       65000,
-				Peers: []kubevip.BGPPeer{
-					{Address: "192.168.1.2", AS: 65001},
-					{Address: "192.168.1.3", AS: 65002},
-				},
-			},
-		}
-		mgr := &Manager{config: config}
-
-		old := os.Stdout
-		r, w, _ := os.Pipe()
-		os.Stdout = w
-
-		mgr.dumpBGPSection()
-
-		w.Close()
-		os.Stdout = old
-
-		var buf bytes.Buffer
-		_, err := io.Copy(&buf, r)
-		assert.NoError(t, err, "io.Copy should not return error")
-		output := buf.String()
-
-		assert.Contains(t, output, "BGP Enabled: true")
-		assert.Contains(t, output, "BGP Router ID: 192.168.1.1")
-		assert.Contains(t, output, "BGP AS: 65000")
-		assert.Contains(t, output, "BGP Peers: 2")
-	})
-}
-
-func TestDumpARPSection(t *testing.T) {
-	t.Run("ARP disabled", func(t *testing.T) {
-		config := &kubevip.Config{
-			EnableARP: false,
-		}
-		mgr := &Manager{config: config}
-
-		old := os.Stdout
-		r, w, _ := os.Pipe()
-		os.Stdout = w
-
-		mgr.dumpARPSection()
-
-		w.Close()
-		os.Stdout = old
-
-		var buf bytes.Buffer
-		_, err := io.Copy(&buf, r)
-		assert.NoError(t, err, "io.Copy should not return error")
-		output := buf.String()
-
-		assert.Contains(t, output, "ARP Enabled: false")
-	})
-
-	t.Run("ARP enabled", func(t *testing.T) {
-		config := &kubevip.Config{
-			EnableARP:        true,
-			ArpBroadcastRate: 5,
-		}
-		mgr := &Manager{config: config}
-
-		old := os.Stdout
-		r, w, _ := os.Pipe()
-		os.Stdout = w
-
-		mgr.dumpARPSection()
-
-		w.Close()
-		os.Stdout = old
-
-		var buf bytes.Buffer
-		_, err := io.Copy(&buf, r)
-		assert.NoError(t, err, "io.Copy should not return error")
-		output := buf.String()
-
-		assert.Contains(t, output, "ARP Enabled: true")
-		assert.Contains(t, output, "ARP Broadcast Rate: 5")
-	})
-}
-
-func TestDumpRuntimeSection(t *testing.T) {
-	config := &kubevip.Config{
-		EnableLoadBalancer:   false,
-		PrometheusHTTPServer: "",
-		HealthCheckPort:      0,
-		EnableUPNP:           false,
-		EgressClean:          false,
-	}
-	mgr := &Manager{config: config}
-
-	old := os.Stdout
-	r, w, _ := os.Pipe()
-	os.Stdout = w
-
-	mgr.dumpRuntimeSection()
-
-	w.Close()
-	os.Stdout = old
-
-	var buf bytes.Buffer
-	_, err := io.Copy(&buf, r)
-	assert.NoError(t, err, "io.Copy should not return error")
-	output := buf.String()
-
-	assert.Contains(t, output, "--- RUNTIME STATISTICS ---", "should contain runtime section header")
-	assert.Contains(t, output, "Load Balancer Enabled: false", "should contain load balancer status")
-	assert.Contains(t, output, "UPNP Enabled: false", "should contain UPNP status")
-}
--- a/pkg/manager/manager_table.go
+++ b/pkg/manager/manager_table.go
@@ -47,26 +47,33 @@ func (sm *Manager) startTableMode(id string) error {

 	// Shutdown function that will wait on this signal, unless we call it ourselves
 	go func() {
-		for {
-			sig := <-sm.signalChan
-			switch sig {
-			case syscall.SIGUSR1:
-				log.Info("Received SIGUSR1, dumping configuration")
-				sm.dumpConfiguration()
-			case syscall.SIGINT, syscall.SIGTERM:
-				log.Info("Received kube-vip termination, signaling shutdown")
-				if sm.config.EnableControlPlane {
-					cpCluster.Stop()
-				}
-				// Cancel the context, which will in turn cancel the leadership
-				cancel()
-				return
-			}
+		<-sm.signalChan
+		log.Info("Received kube-vip termination, signaling shutdown")
+		if sm.config.EnableControlPlane {
+			cpCluster.Stop()
 		}
+
+		// Cancel the context, which will in turn cancel the leadership
+		cancel()
 	}()

-	if sm.config.EnableServices {
-		log.Debug("starting Services")
+	if sm.config.EnableControlPlane {
+		cpCluster, err = cluster.InitCluster(sm.config, false, sm.intfMgr, sm.arpMgr)
+		if err != nil {
+			return fmt.Errorf("cluster initialization error: %w", err)
+		}
+
+		clusterManager, err := initClusterManager(sm)
+		if err != nil {
+			return fmt.Errorf("cluster manager initialization error: %w", err)
+		}
+
+		if err := cpCluster.StartVipService(sm.config, clusterManager, nil); err != nil {
+			log.Error("Control Plane", "err", err)
+			// Trigger the shutdown of this manager instance
+			sm.signalChan <- syscall.SIGINT
+		}
+	} else {
 		ns, err := returnNameSpace()
 		if err != nil {
 			log.Warn("unable to auto-detect namespace", "dropping to", sm.config.Namespace)
@@ -142,34 +149,9 @@ func (sm *Manager) startTableMode(id string) error {
 			err = sm.svcProcessor.ServicesWatcher(ctx, sm.svcProcessor.SyncServices)
 			if err != nil {
 				log.Error("Cannot watch services", "err", err)
-			} else {
-				log.Debug("watching services")
 			}
 		}
 	}
-	if sm.config.EnableControlPlane {
-		log.Debug("initCluster for ControlPlane")
-		cpCluster, err = cluster.InitCluster(sm.config, false, sm.intfMgr, sm.arpMgr)
-		if err != nil {
-			log.Debug("init of ControlPlane NOT successful")
-			return fmt.Errorf("cluster initialization error: %w", err)
-		}
-		log.Debug("init of ControlPlane successful")
-		log.Debug("init ClusterManager")
-		clusterManager, err := initClusterManager(sm)
-		if err != nil {
-			log.Debug("init cluster manager NOT successful")
-			return fmt.Errorf("cluster manager initialization error: %w", err)
-		}
-		log.Debug("init ClusterManager successful")
-		if err := cpCluster.StartVipService(sm.config, clusterManager, nil); err != nil {
-			log.Error("Control Plane", "err", err)
-			// Trigger the shutdown of this manager instance
-			sm.signalChan <- syscall.SIGINT
-		} else {
-			log.Debug("start VipServer for cluster manager successful")
-		}
-	}

 	return nil
 }
--- a/pkg/manager/manager_wireguard.go
+++ b/pkg/manager/manager_wireguard.go
@@ -2,7 +2,6 @@ package manager

 import (
 	"context"
-	"syscall"
 	"time"

 	log "log/slog"
@@ -40,19 +39,11 @@ func (sm *Manager) startWireguard(id string) error {

 	// Shutdown function that will wait on this signal, unless we call it ourselves
 	go func() {
-		for {
-			sig := <-sm.signalChan
-			switch sig {
-			case syscall.SIGUSR1:
-				log.Info("Received SIGUSR1, dumping configuration")
-				sm.dumpConfiguration()
-			case syscall.SIGINT, syscall.SIGTERM:
-				log.Info("Received termination, signaling shutdown")
-				// Cancel the context, which will in turn cancel the leadership
-				cancel()
-				return
-			}
-		}
+		<-sm.signalChan
+		log.Info("Received termination, signaling shutdown")
+
+		// Cancel the context, which will in turn cancel the leadership
+		cancel()
 	}()

 	ns, err = returnNameSpace()
--- a/pkg/manager/node_labeling.go
+++ b/pkg/manager/node_labeling.go
@@ -7,12 +7,16 @@ import (

 	log "log/slog"

-	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 )

+const (
+	nodeLabelIndex    = "kube-vip.io/has-ip"
+	nodeLabelJSONPath = `kube-vip.io~1has-ip`
+)
+
 type patchStringLabel struct {
 	Op    string `json:"op"`
 	Path  string `json:"path"`
@@ -31,8 +35,8 @@ func applyNodeLabel(clientSet *kubernetes.Clientset, address, id, identity strin

 	log.Debug(fmt.Sprintf("node %s labels: %+v", id, node.Labels))

-	value, ok := node.Labels[kubevip.HasIP]
-	path := fmt.Sprintf("/metadata/labels/%s", kubevip.HasIPJSONPath)
+	value, ok := node.Labels[nodeLabelIndex]
+	path := fmt.Sprintf("/metadata/labels/%s", nodeLabelJSONPath)
 	log.Debug(fmt.Sprintf("Received identity: %s - id: %s", identity, id))
 	if ok && value == address {
 		log.Debug(fmt.Sprintf("removing node label `has-ip=%s` on %s", address, id))
--- a/pkg/manager/watch_annotations.go
+++ b/pkg/manager/watch_annotations.go
@@ -10,7 +10,7 @@ import (

 	log "log/slog"

-	"github.com/kube-vip/kube-vip/pkg/kubevip"
+	"github.com/kube-vip/kube-vip/pkg/bgp"

 	"github.com/davecgh/go-spew/spew"
 	v1 "k8s.io/api/core/v1"
@@ -151,8 +151,8 @@ func (sm *Manager) annotationsWatcher() error {
 // * `<info>` is the relevant information, such as `node-asn` or `peer-ip`
 // * `{{n}}` is the number of the peer, always starting with `0`
 // * kube-vip is only designed to manage one peer, just look for {{n}} == 0
-func parseBgpAnnotations(bgpConfig kubevip.BGPConfig, node *v1.Node, prefix string) (kubevip.BGPConfig, kubevip.BGPPeer, error) {
-	bgpPeer := kubevip.BGPPeer{}
+func parseBgpAnnotations(bgpConfig bgp.Config, node *v1.Node, prefix string) (bgp.Config, bgp.Peer, error) {
+	bgpPeer := bgp.Peer{}

 	nodeASN := ""
 	for k, v := range node.Annotations {
@@ -216,7 +216,7 @@ func parseBgpAnnotations(bgpConfig kubevip.BGPConfig, node *v1.Node, prefix stri

 	peerIPs := strings.Split(peerIPString, ",")

-	bgpConfig.Peers = make([]kubevip.BGPPeer, 0, len(peerIPs))
+	bgpConfig.Peers = make([]bgp.Peer, 0, len(peerIPs))
 	for _, peerIP := range peerIPs {
 		ipAddr := strings.TrimSpace(peerIP)

--- a/pkg/manager/watcher_test.go
+++ b/pkg/manager/watcher_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"

-	"github.com/kube-vip/kube-vip/pkg/kubevip"
+	"github.com/kube-vip/kube-vip/pkg/bgp"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -15,7 +15,7 @@ func TestParseBgpAnnotations(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "test", Annotations: map[string]string{}},
 	}

-	bgpConfigBase := kubevip.BGPConfig{
+	bgpConfigBase := bgp.Config{
 		HoldTime:          15,
 		KeepaliveInterval: 5,
 	}
@@ -54,7 +54,7 @@ func TestParseBgpAnnotations(t *testing.T) {
 		t.Fatal("Parsing BGP annotations should return nil when minimum config is met")
 	}

-	bgpPeers := []kubevip.BGPPeer{
+	bgpPeers := []bgp.Peer{
 		{Address: "10.0.0.1", AS: uint32(64000), Password: "password"},
 		{Address: "10.0.0.2", AS: uint32(64000), Password: "password"},
 		{Address: "10.0.0.3", AS: uint32(64000), Password: "password"},
@@ -77,7 +77,7 @@ func TestParseNewBgpAnnotations(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "test", Annotations: map[string]string{}},
 	}

-	bgpConfigBase := kubevip.BGPConfig{
+	bgpConfigBase := bgp.Config{
 		HoldTime:          15,
 		KeepaliveInterval: 5,
 	}
@@ -99,7 +99,7 @@ func TestParseNewBgpAnnotations(t *testing.T) {
 		t.Fatalf("Parsing BGP annotations should return nil when minimum config is met [%v]", err)
 	}

-	bgpPeers := []kubevip.BGPPeer{
+	bgpPeers := []bgp.Peer{
 		{Address: "10.0.0.1", AS: uint32(64000), Password: "password"},
 		{Address: "10.0.0.2", AS: uint32(64000), Password: "password"},
 		{Address: "10.0.0.3", AS: uint32(64000), Password: "password"},
@@ -121,15 +121,15 @@ func Test_parseBgpAnnotations(t *testing.T) {
 	tests := []struct {
 		name    string
 		args    args
-		want    kubevip.BGPConfig
-		want1   kubevip.BGPPeer
+		want    bgp.Config
+		want1   bgp.Peer
 		wantErr bool
 	}{
 		// TODO: Add test cases.
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, got1, err := parseBgpAnnotations(kubevip.BGPConfig{}, tt.args.node, tt.args.prefix)
+			got, got1, err := parseBgpAnnotations(bgp.Config{}, tt.args.node, tt.args.prefix)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("parseBgpAnnotations() error = %v, wantErr %v", err, tt.wantErr)
 				return
--- a/pkg/nftables/nftables.go
+++ b/pkg/nftables/nftables.go
@@ -11,7 +11,6 @@ import (
 	"github.com/google/nftables"
 	"github.com/google/nftables/binaryutil"
 	"github.com/google/nftables/expr"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"golang.org/x/sys/unix"
 )

@@ -21,6 +20,7 @@ const (
 )

 func ApplySNAT(podIP, vipIP, service, destinationPorts string, ignoreCIDR []string, IPv6 bool) error {
+
 	conn, err := nftables.New()
 	if err != nil {
 		return err
@@ -40,12 +40,10 @@ func ApplySNAT(podIP, vipIP, service, destinationPorts string, ignoreCIDR []stri
 			conn.AddTable(GetTable(IPv6))
 		}
 	}
-	slog.Debug("[egress]", "Creating Chain for service", service, utils.IPv6Family, IPv6)
+	slog.Debug("[egress]", "Creating Chain for service", service, "IPv6", IPv6)
+	// These don't return errors, so not 100% sure how to guarantee things were created
 	conn.AddChain(GetSNatChain(IPv6, service))
-	err = conn.Flush()
-	if err != nil {
-		return err
-	}
+	conn.Flush()
 	// Create our nftables rule
 	rule, err := CreateRule(podIP, vipIP, service, destinationPorts, ignoreCIDR, conn, IPv6)
 	if err != nil {
@@ -458,29 +456,3 @@ func CreateRule(podIP, vipIP, service, destinationPorts string, ignoreCIDR []str

 	return rule, nil
 }
-
-// Returns a list of all chains IPv4/IPv6 in nftables
-func ListChains() ([]string, error) {
-	chains := []string{}
-	conn, err := nftables.New()
-	if err != nil {
-		return nil, err
-	}
-	ipv4, err := conn.ListChainsOfTableFamily(nftables.TableFamilyIPv4)
-	if err != nil {
-		return nil, err
-	}
-	ipv6, err := conn.ListChainsOfTableFamily(nftables.TableFamilyIPv6)
-	if err != nil {
-		return nil, err
-	}
-	for x := range ipv4 {
-		chains = append(chains, fmt.Sprintf("Table=%s, Chain=%s", ipv4[x].Table.Name, ipv4[x].Name))
-	}
-	for x := range ipv6 {
-		chains = append(chains, fmt.Sprintf("Table=%s, Chain=%s", ipv6[x].Table.Name, ipv6[x].Name))
-	}
-
-	_ = conn.CloseLasting() // TODO: Should we ignore this error, we're not actually doing any actions with nftables
-	return chains, nil
-}
--- a/pkg/node/labeler/label_manager.go
+++ b/pkg/node/labeler/label_manager.go
@@ -1,164 +0,0 @@
-package labeler
-
-import (
-	"context"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"net"
-	"strings"
-	"time"
-
-	log "log/slog"
-
-	"github.com/kube-vip/kube-vip/pkg/instance"
-	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/kubernetes"
-)
-
-const (
-	// labelName is the name of the label that will be added to the node
-	// it is prefix for the label key before "/"
-	labelName = "service-provided.kube-vip.io"
-)
-
-// labelOperation is the operation to perform on the node labels
-type labelOperation string
-
-// labelOperation constants
-const (
-	labelOperationRemove labelOperation = "remove"
-	labelOperationAdd    labelOperation = "add"
-)
-
-// NewManager creates a new Label Manager for the given node
-func NewManager(nodeName string, clientSet *kubernetes.Clientset) *Manager {
-	return &Manager{
-		nodeName:  nodeName,
-		clientSet: clientSet,
-	}
-}
-
-// Manager is the label Manager for the node
-type Manager struct {
-	// nodeName is the name of the node to manage
-	nodeName string
-
-	// clientSet is the Kubernetes client set to use
-	clientSet *kubernetes.Clientset
-}
-
-// AddLabel a new label to the node
-func (m *Manager) AddLabel(ctx context.Context, svc *corev1.Service) error {
-	log.Debug("[service] add label to node", "namespace", svc.Namespace, "name", svc.Name)
-	labelKey, labelValue := generateNodeLabelKeyValue(svc)
-	return m.patchNode(ctx, labelOperationAdd, map[string]string{labelKey: labelValue})
-}
-
-// RemoveLabel a label from the node
-func (m *Manager) RemoveLabel(ctx context.Context, svc *corev1.Service) error {
-	log.Debug("[service] delete label from node", "namespace", svc.Namespace, "name", svc.Name)
-	labelKey, _ := generateNodeLabelKeyValue(svc)
-	return m.patchNode(ctx, labelOperationRemove, map[string]string{labelKey: ""})
-}
-
-// clean up the node labels
-func (m *Manager) CleanUpLabels(timeout time.Duration) error {
-	log.Debug("cleaning up labels for node", "node", m.nodeName, "timeout", timeout)
-
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	// get the node
-	node, err := m.clientSet.CoreV1().Nodes().Get(ctx, m.nodeName, metav1.GetOptions{})
-	if err != nil {
-		return errors.Wrapf(err, "failed to get node %s", m.nodeName)
-	}
-
-	// collect all labels with the prefix to remove
-	labels := map[string]string{}
-	for k := range node.Labels {
-		if strings.HasPrefix(k, labelName) {
-			labels[k] = ""
-		}
-	}
-
-	if len(labels) == 0 {
-		log.Debug("no labels to remove for node", "node", m.nodeName)
-		return nil
-	}
-
-	// patch the node with the labels to remove
-	return m.patchNode(ctx, labelOperationRemove, labels)
-}
-
-// generateNodeLabelKeyValue generates a label key and value for the given service
-func generateNodeLabelKeyValue(svc *corev1.Service) (string, string) {
-	addresses, _ := instance.FetchServiceAddresses(svc)
-
-	sanitized := make([]string, len(addresses))
-	for i, addr := range addresses {
-		sanitized[i] = sanitizeIPForLabel(addr)
-	}
-
-	return fmt.Sprintf("%s/%s.%s", labelName, svc.Name, svc.Namespace), strings.Join(sanitized, ",")
-}
-
-// Helper function to convert IPv6 hex address without colons
-func sanitizeIPForLabel(addr string) string {
-	ip := net.ParseIP(addr)
-	if ip == nil || ip.To4() != nil {
-		return addr
-	}
-	return hex.EncodeToString(ip.To16())
-}
-
-// patchNode patches the node with the given labels
-func (m *Manager) patchNode(ctx context.Context, operation labelOperation, labels map[string]string) error {
-	type patchStringLabel struct {
-		Op    string `json:"op"`
-		Path  string `json:"path"`
-		Value string `json:"value"`
-	}
-
-	patchLabels := []patchStringLabel{}
-	// generate the patch
-	for k, v := range labels {
-		patchLabels = append(patchLabels, patchStringLabel{
-			Op: string(operation),
-			// replace all slashes with ~1
-			Path:  fmt.Sprintf("/metadata/labels/%s", strings.ReplaceAll(k, "/", "~1")),
-			Value: v,
-		})
-	}
-
-	patchData, err := json.Marshal(patchLabels)
-	if err != nil {
-		log.Debug("node patch marshaling failed", "err", err, "labels", labels, "patch", patchLabels)
-		return errors.Wrapf(err, "node patch marshaling failed for labels %v", labels)
-	}
-
-	log.Debug("patching node",
-		"node", m.nodeName,
-		"patch", string(patchData),
-		"operation", operation,
-		"labels", labels,
-		"clientSetNil", m.clientSet == nil)
-	if m.clientSet == nil {
-		return errors.New("kubernetes client is not initialized")
-	}
-
-	// patch node
-	node, err := m.clientSet.CoreV1().Nodes().Patch(ctx, m.nodeName, types.JSONPatchType, patchData, metav1.PatchOptions{})
-	if err != nil {
-		log.Debug("node patching failed", "err", err, "patchData", patchData)
-		return errors.Wrapf(err, "node patching failed with patch %s", string(patchData))
-	}
-
-	log.Debug("updated", "node", m.nodeName, "labels", node.Labels)
-
-	return nil
-}
--- a/pkg/node/noop/label_noop_manager.go
+++ b/pkg/node/noop/label_noop_manager.go
@@ -1,27 +0,0 @@
-package noop
-
-import (
-	"context"
-	"time"
-
-	corev1 "k8s.io/api/core/v1"
-)
-
-// NewManager creates a new NoOp label manager
-func NewManager() *Manager {
-	return &Manager{}
-}
-
-type Manager struct{}
-
-func (m *Manager) AddLabel(_ context.Context, _ *corev1.Service) error {
-	return nil
-}
-
-func (m *Manager) RemoveLabel(_ context.Context, _ *corev1.Service) error {
-	return nil
-}
-
-func (m *Manager) CleanUpLabels(_ time.Duration) error {
-	return nil
-}
--- a/pkg/node/types.go
+++ b/pkg/node/types.go
@@ -1,49 +0,0 @@
-package node
-
-import (
-	"context"
-	"time"
-
-	log "log/slog"
-
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/kube-vip/kube-vip/pkg/node/labeler"
-	"github.com/kube-vip/kube-vip/pkg/node/noop"
-	v1 "k8s.io/api/core/v1"
-	"k8s.io/client-go/kubernetes"
-)
-
-// LabelManager is the interface for the node label manager
-type LabelManager interface {
-	// AddLabel adds a label to the node for the given service
-	AddLabel(ctx context.Context, svc *v1.Service) error
-
-	// RemoveLabel removes the label from the node for the given service
-	RemoveLabel(ctx context.Context, svc *v1.Service) error
-
-	// CleanUpLabels removes all labels from the node
-	CleanUpLabels(timeout time.Duration) error
-}
-
-// NewManager creates a new Label Manager for the given node
-// NoOp implementation is returned if node labeling is disabled, or if
-// running in control plane mode, or if the client is not ready
-func NewManager(config *kubevip.Config, clientSet *kubernetes.Clientset) LabelManager {
-	if !config.EnableNodeLabeling {
-		return noop.NewManager()
-	}
-
-	if config.EnableControlPlane {
-		log.Debug("Skip node labeling, control plane mode enabled")
-		return noop.NewManager()
-	}
-
-	if clientSet == nil {
-		log.Debug("Skip node labeling, client is not ready")
-		return noop.NewManager()
-	}
-
-	log.Debug("Node labeling enabled")
-
-	return labeler.NewManager(config.NodeName, clientSet)
-}
--- a/pkg/services/context.go
+++ b/pkg/services/context.go
@@ -0,0 +1,36 @@
+package services
+
+import (
+	"context"
+	"sync"
+)
+
+type Context struct {
+	Ctx                context.Context
+	Cancel             context.CancelFunc
+	IsActive           bool
+	IsWatched          bool
+	ConfiguredNetworks sync.Map
+}
+
+func NewContext(ctx context.Context) *Context {
+	svcCtx, svcCancel := context.WithCancel(ctx)
+	return &Context{
+		Ctx:    svcCtx,
+		Cancel: svcCancel,
+	}
+}
+
+func (ctx *Context) HasConfiguredNetworks() bool {
+	cnt := 0
+	ctx.ConfiguredNetworks.Range(func(_ any, _ any) bool {
+		cnt++
+		return cnt < 1
+	})
+	return cnt > 0
+}
+
+func (ctx *Context) IsNetworkConfigured(ip string) bool {
+	_, exists := ctx.ConfiguredNetworks.Load(ip)
+	return exists
+}
--- a/pkg/services/egress.go
+++ b/pkg/services/egress.go
@@ -13,7 +13,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/iptables"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/nftables"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -78,12 +77,12 @@ func (p *Processor) nftablesCheck() error {

 func getSameFamilyCidr(sourceCidrs, ip string) string { //Todo: not sure how this ever worked
 	cidrs := strings.Split(sourceCidrs, ",")
-	isV6 := utils.IsIPv6(ip)
+	isV6 := vip.IsIPv6(ip)
 	matchingFamily := []string{}
 	for _, cidr := range cidrs {
 		// Is the ip an IPv6 address
 		if isV6 {
-			if utils.IsIPv6CIDR(cidr) {
+			if vip.IsIPv6CIDR(cidr) {
 				matchingFamily = append(matchingFamily, cidr)
 				selectedCIDR, err := checkCIDR(ip, cidr)
 				if err != nil {
@@ -95,7 +94,7 @@ func getSameFamilyCidr(sourceCidrs, ip string) string { //Todo: not sure how thi
 				}
 			}
 		} else {
-			if utils.IsIPv4CIDR(cidr) {
+			if vip.IsIPv4CIDR(cidr) {
 				matchingFamily = append(matchingFamily, cidr)
 				selectedCidr, err := checkCIDR(ip, cidr)
 				if err != nil {
@@ -164,7 +163,7 @@ func (p *Processor) configureEgress(vipIP, podIP, namespace, serviceUUID string,

 	if podCidr == "" {
 		// There's no default IPv6 pod CIDR, therefore we silently back off if CIDR s not specified.
-		if !utils.IsIPv4(podIP) {
+		if !vip.IsIPv4(podIP) {
 			return fmt.Errorf("error with the CIDR [%s]", podIP)
 		}
 		podCidr = defaultPodCIDR
@@ -180,7 +179,7 @@ func (p *Processor) configureEgress(vipIP, podIP, namespace, serviceUUID string,

 	if serviceCidr == "" {
 		// There's no default IPv6 service CIDR, therefore we silently back off if CIDR s not specified.
-		if !utils.IsIPv4(vipIP) {
+		if !vip.IsIPv4(vipIP) {
 			return nil
 		}
 		serviceCidr = defaultServiceCIDR
@@ -189,23 +188,23 @@ func (p *Processor) configureEgress(vipIP, podIP, namespace, serviceUUID string,
 	log.Info("[Egress]", "podCIDR", podCidr, "serviceCIDR", serviceCidr, "vip", serviceCidr, "pod", podIP)

 	// checking if all addresses are of the same IP family
-	if utils.IsIPv4(podIP) != utils.IsIPv4CIDR(podCidr) {
+	if vip.IsIPv4(podIP) != vip.IsIPv4CIDR(podCidr) {
 		log.Error("[Egress] family is not matching. Backing off...", "pod", podIP, "podCIDR", podCidr)
 		return nil
 	}

-	if utils.IsIPv4(vipIP) != utils.IsIPv4CIDR(serviceCidr) {
+	if vip.IsIPv4(vipIP) != vip.IsIPv4CIDR(serviceCidr) {
 		log.Error("[Egress] family is not matching. Backing off...", "pod", podIP, "serviceCIDR", serviceCidr)
 		return nil
 	}

-	if utils.IsIPv4(vipIP) != utils.IsIPv4(podIP) {
+	if vip.IsIPv4(vipIP) != vip.IsIPv4(podIP) {
 		log.Error("[Egress] family is not matching. Backing off...", "pod", podIP, "vipIP", vipIP)
 		return nil
 	}

 	protocol := iptables.ProtocolIPv4
-	if utils.IsIPv6(vipIP) {
+	if vip.IsIPv6(vipIP) {
 		protocol = iptables.ProtocolIPv6
 	}

@@ -225,7 +224,7 @@ func (p *Processor) configureEgress(vipIP, podIP, namespace, serviceUUID string,
 		}

 		// Apply the SNAT rules
-		err := nftables.ApplySNAT(podIP, vipIP, serviceUUID, destinationPorts, ignoreCIDRs, utils.IsIPv6(vipIP))
+		err := nftables.ApplySNAT(podIP, vipIP, serviceUUID, destinationPorts, ignoreCIDRs, vip.IsIPv6(vipIP))
 		if err != nil {
 			return fmt.Errorf("error performing netlink nftables [%s]", err)
 		}
@@ -270,7 +269,7 @@ func (p *Processor) configureEgress(vipIP, podIP, namespace, serviceUUID string,
 	}

 	mask := "/32"
-	if !utils.IsIPv4(podIP) {
+	if !vip.IsIPv4(podIP) {
 		mask = "/128"
 	}

--- a/pkg/services/leader.go
+++ b/pkg/services/leader.go
@@ -3,17 +3,25 @@ package services
 import (
 	"context"
 	"fmt"
+	"sync"
 	"time"

 	log "log/slog"

-	"github.com/kube-vip/kube-vip/pkg/lease"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 )

+var (
+	svcLocks map[string]*sync.Mutex
+)
+
+func init() {
+	svcLocks = make(map[string]*sync.Mutex)
+}
+
 // The StartServicesWatchForLeaderElection function will start a services watcher, the
 func (p *Processor) StartServicesWatchForLeaderElection(ctx context.Context) error {
 	err := p.ServicesWatcher(ctx, p.StartServicesLeaderElection)
@@ -21,14 +29,12 @@ func (p *Processor) StartServicesWatchForLeaderElection(ctx context.Context) err
 		return err
 	}

-	if p.config.EnableRoutingTable {
-		for _, instance := range p.ServiceInstances {
-			for _, cluster := range instance.Clusters {
-				for i := range cluster.Network {
-					_ = cluster.Network[i].DeleteRoute()
-				}
-				cluster.Stop()
+	for _, instance := range p.ServiceInstances {
+		for _, cluster := range instance.Clusters {
+			for i := range cluster.Network {
+				_ = cluster.Network[i].DeleteRoute()
 			}
+			cluster.Stop()
 		}
 	}

@@ -39,7 +45,7 @@ func (p *Processor) StartServicesWatchForLeaderElection(ctx context.Context) err

 // The startServicesWatchForLeaderElection function will start a services watcher, the
 func (p *Processor) StartServicesLeaderElection(ctx context.Context, service *v1.Service) error {
-	serviceLease, _ := lease.GetName(service)
+	serviceLease := fmt.Sprintf("kubevip-%s", service.Name)
 	log.Info("new leader election", "service", service.Name, "namespace", service.Namespace, "lock_name", serviceLease, "host_id", p.config.NodeName)
 	// we use the Lease lock type since edits to Leases are less common
 	// and fewer objects in the cluster watch "all Leases".
@@ -53,12 +59,15 @@ func (p *Processor) StartServicesLeaderElection(ctx context.Context, service *v1
 			Identity: p.config.NodeName,
 		},
 	}
+	childCtx, childCancel := context.WithCancel(ctx)
+	defer childCancel()

-	go func() {
-		// wait for the service context to end and delete the lease then
-		<-ctx.Done()
-		p.leaseMgr.Delete(service)
-	}()
+	if _, ok := svcLocks[serviceLease]; !ok {
+		svcLocks[serviceLease] = new(sync.Mutex)
+	}
+
+	svcLocks[serviceLease].Lock()
+	defer svcLocks[serviceLease].Unlock()

 	svcCtx, err := p.getServiceContext(service.UID)
 	if err != nil {
@@ -70,40 +79,8 @@ func (p *Processor) StartServicesLeaderElection(ctx context.Context, service *v1

 	svcCtx.IsActive = true

-	svcLease, isNew := p.leaseMgr.Add(service)
-	// this service is sharing lease
-	if !isNew {
-		// wait for leader election to start or context to be done
-		select {
-		case <-svcLease.Started:
-		case <-svcLease.Ctx.Done():
-			svcCtx.IsActive = false
-			return nil
-		}
-		<-svcLease.Started
-
-		if lease.UsesCommon(service) {
-			if err := p.SyncServices(ctx, service); err != nil {
-				log.Error("service sync", "err", err)
-				svcLease.Cancel()
-			}
-			// just block until context is cancelled
-			<-ctx.Done()
-			if svcCtx.IsActive {
-				if err := p.deleteService(service.UID); err != nil {
-					log.Error("service deletion", "err", err)
-				}
-			}
-		}
-
-		// wait for leaderelection to be finished
-		<-svcLease.Ctx.Done()
-		// Mark this service is inactive
-		svcCtx.IsActive = false
-		return nil
-	}
 	// start the leader election code loop
-	leaderelection.RunOrDie(svcLease.Ctx, leaderelection.LeaderElectionConfig{
+	leaderelection.RunOrDie(childCtx, leaderelection.LeaderElectionConfig{
 		Lock: lock,
 		// IMPORTANT: you MUST ensure that any code you have that
 		// is protected by the lease must terminate **before**
@@ -121,9 +98,8 @@ func (p *Processor) StartServicesLeaderElection(ctx context.Context, service *v1
 				// we run this in background as it's blocking
 				if err := p.SyncServices(ctx, service); err != nil {
 					log.Error("service sync", "err", err)
-					svcLease.Cancel()
+					childCancel()
 				}
-				close(svcLease.Started)
 			},
 			OnStoppedLeading: func() {
 				// we can do cleanup here
--- a/pkg/services/processor.go
+++ b/pkg/services/processor.go
@@ -13,7 +13,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/endpoints/providers"
 	"github.com/kube-vip/kube-vip/pkg/instance"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/kube-vip/kube-vip/pkg/lease"
 	"github.com/kube-vip/kube-vip/pkg/networkinterface"
 	"github.com/kube-vip/kube-vip/pkg/servicecontext"
 	"github.com/kube-vip/kube-vip/pkg/vip"
@@ -47,22 +46,11 @@ type Processor struct {

 	intfMgr *networkinterface.Manager
 	arpMgr  *arp.Manager
-
-	leaseMgr *lease.Manager
-
-	// nodeLabelManager is the manager for the node labels
-	nodeLabelManager labelManager
-}
-
-// labelManager is the interface for the node label manager to add/remove labels
-type labelManager interface {
-	AddLabel(ctx context.Context, svc *v1.Service) error
-	RemoveLabel(ctx context.Context, svc *v1.Service) error
 }

 func NewServicesProcessor(config *kubevip.Config, bgpServer *bgp.Server,
 	clientSet *kubernetes.Clientset, rwClientSet *kubernetes.Clientset, shutdownChan chan struct{},
-	intfMgr *networkinterface.Manager, arpMgr *arp.Manager, nodeLabelManager labelManager) *Processor {
+	intfMgr *networkinterface.Manager, arpMgr *arp.Manager) *Processor {
 	lbClassFilterFunc := lbClassFilter
 	if config.LoadBalancerClassLegacyHandling {
 		lbClassFilterFunc = lbClassFilterLegacy
@@ -83,10 +71,8 @@ func NewServicesProcessor(config *kubevip.Config, bgpServer *bgp.Server,
 			Help:      "Count all events fired by the service watcher categorised by event type",
 		}, []string{"type"}),

-		intfMgr:          intfMgr,
-		arpMgr:           arpMgr,
-		leaseMgr:         lease.NewManager(),
-		nodeLabelManager: nodeLabelManager,
+		intfMgr: intfMgr,
+		arpMgr:  arpMgr,
 	}
 }

@@ -103,7 +89,7 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 	}

 	// Check if we ignore this service
-	if svc.Annotations[kubevip.LoadbalancerIgnore] == "true" {
+	if svc.Annotations["kube-vip.io/ignore"] == "true" {
 		log.Info("ignore annotation for kube-vip", "service name", svc.Name)
 		return true, nil
 	}
@@ -113,19 +99,13 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 		return true, nil
 	}

-	svcAddresses, svcHostnames := instance.FetchServiceAddresses(svc)
+	svcAddresses := instance.FetchServiceAddresses(svc)

 	// We only care about LoadBalancer services that have been allocated an address
 	if len(svcAddresses) <= 0 {
 		return true, nil
 	}

-	_, usesCommonLease := svc.Annotations[kubevip.ServiceLease]
-	if usesCommonLease && svc.Spec.ExternalTrafficPolicy != v1.ServiceExternalTrafficPolicyTypeCluster {
-		return false, fmt.Errorf("annotation %q cannot be used with service traffic policy other than %q",
-			kubevip.ServiceLease, v1.ServiceExternalTrafficPolicyTypeCluster)
-	}
-
 	svcCtx, err := p.getServiceContext(svc.UID)
 	if err != nil {
 		return false, fmt.Errorf("failed to get service context: %w", err)
@@ -134,20 +114,15 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 	// The modified event should only be triggered if the service has been modified (i.e. moved somewhere else)
 	if event.Type == watch.Modified {
 		i := instance.FindServiceInstance(svc, p.ServiceInstances)
+		var originalService []string
 		shouldGarbageCollect := true
 		if i != nil {
-			originalServiceAddresses, originalServiceHostnames := instance.FetchServiceAddresses(i.ServiceSnapshot)
-			shouldGarbageCollect =
-				// Service addresses changed
-				!reflect.DeepEqual(originalServiceAddresses, svcAddresses) ||
-					// Service hostnames changed
-					!reflect.DeepEqual(originalServiceHostnames, svcHostnames) ||
-					// ExternalTrafficPolicy changed
-					svc.Spec.ExternalTrafficPolicy != i.ServiceSnapshot.Spec.ExternalTrafficPolicy
+			originalService = instance.FetchServiceAddresses(i.ServiceSnapshot)
+			shouldGarbageCollect = !reflect.DeepEqual(originalService, svcAddresses)
 		}
 		if shouldGarbageCollect {
 			for _, addr := range svcAddresses {
-				// log.Debugf("(svcs) Retrieving local addresses, to ensure that this modified address doesn't exist: %s", addr)
+				// log.Debugf("(svcs) Retreiving local addresses, to ensure that this modified address doesn't exist: %s", addr)
 				f, err := vip.GarbageCollect(p.config.Interface, addr, p.intfMgr)
 				if err != nil {
 					log.Error("(svcs) cleaning existing address error", "err", err)
@@ -156,23 +131,30 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 					log.Warn("(svcs) already found existing config", "address", addr, "adapter", p.config.Interface)
 				}
 			}
-			// This service has been modified, but it was also active.
-			if svcCtx != nil && svcCtx.IsActive {
-				log.Warn("(svcs) The load balancer has changed, cancelling original load balancer")
-				//Set it to inactive
-				svcCtx.IsActive = false
-				svcCtx.Cancel()
-				log.Warn("(svcs) waiting for load balancer to finish")
-				<-svcCtx.Ctx.Done()
+		}
+		// This service has been modified, but it was also active.
+		if svcCtx != nil && svcCtx.IsActive {
+			if i != nil {
+				originalService := instance.FetchServiceAddresses(i.ServiceSnapshot)
+				newService := instance.FetchServiceAddresses(svc)
+				if !reflect.DeepEqual(originalService, newService) {

-				if err := p.deleteService(svc.UID); err != nil {
-					log.Error("(svc) unable to remove", "service", svc.UID)
+					// Calls the cancel function of the context
+					if svcCtx != nil {
+						log.Warn("(svcs) The load balancer has changed, cancelling original load balancer")
+						svcCtx.Cancel()
+						log.Warn("(svcs) waiting for load balancer to finish")
+						<-svcCtx.Ctx.Done()
+					}
+
+					err = p.deleteService(svc.UID)
+					if err != nil {
+						log.Error("(svc) unable to remove", "service", svc.UID)
+					}
+
+					p.svcMap.Delete(svc.UID)
 				}
 				// in theory this should never fail
-				p.svcMap.Delete(svc.UID)
-				// Reset the the svcCtx when it was garbage collected
-				// As the next function will create a new context when nil
-				svcCtx = nil
 			}
 		}
 	}
@@ -184,8 +166,7 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 	//

 	if svcCtx == nil || svcCtx != nil && !svcCtx.IsActive {
-		ips, hostnames := instance.FetchServiceAddresses(svc)
-		log.Debug("(svcs) has been added/modified with addresses", "service name", svc.Name, "ips", ips, "hostnames", hostnames)
+		log.Debug("(svcs) has been added/modified with addresses", "service name", svc.Name, "ip", instance.FetchServiceAddresses(svc))

 		if svcCtx == nil {
 			svcCtx = servicecontext.New(ctx)
@@ -285,22 +266,21 @@ func (p *Processor) AddOrModify(ctx context.Context, event watch.Event, serviceF
 func (p *Processor) Delete(event watch.Event) (bool, error) {
 	svc, ok := event.Object.(*v1.Service)
 	if !ok {
-		return false, fmt.Errorf("(svcs) unable to parse Kubernetes services from API watcher")
+		return false, fmt.Errorf("unable to parse Kubernetes services from API watcher")
 	}
 	svcCtx, err := p.getServiceContext(svc.UID)
 	if err != nil {
 		return false, fmt.Errorf("(svcs) unable to get context: %w", err)
 	}
-
-	if svcCtx != nil {
+	if svcCtx != nil && svcCtx.IsActive {
 		// We only care about LoadBalancer services
 		if svc.Spec.Type != v1.ServiceTypeLoadBalancer {
 			return true, nil
 		}

 		// We can ignore this service
-		if svc.Annotations[kubevip.LoadbalancerIgnore] == "true" {
-			log.Info("(svcs) ignore annotation for kube-vip", "service name", svc.Name)
+		if svc.Annotations["kube-vip.io/ignore"] == "true" {
+			log.Info("(svcs)ignore annotation for kube-vip", "service name", svc.Name)
 			return true, nil
 		}

@@ -320,13 +300,20 @@ func (p *Processor) Delete(event watch.Event) (bool, error) {

 		// Calls the cancel function of the context
 		log.Warn("(svcs) The load balancer was deleted, cancelling context")
-		svcCtx.IsActive = false
 		svcCtx.Cancel()
 		log.Warn("(svcs) waiting for load balancer to finish")
 		<-svcCtx.Ctx.Done()
 		p.svcMap.Delete(svc.UID)
 	}

+	if p.config.EnableLeaderElection && !p.config.EnableServicesElection {
+		if p.config.EnableBGP {
+			endpoints.ClearBGPHosts(svc, &p.ServiceInstances, p.bgpServer)
+		} else if p.config.EnableRoutingTable {
+			endpoints.ClearRoutes(svc, &p.ServiceInstances)
+		}
+	}
+
 	log.Info("(svcs) deleted", "service name", svc.Name, "namespace", svc.Namespace)

 	return true, nil
--- a/pkg/services/services.go
+++ b/pkg/services/services.go
@@ -12,7 +12,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/vishvananda/netlink"
 	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -24,7 +23,6 @@ import (
 	"github.com/kube-vip/kube-vip/pkg/instance"
 	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	"github.com/kube-vip/kube-vip/pkg/upnp"
-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 )

@@ -44,38 +42,26 @@ func (p *Processor) SyncServices(ctx context.Context, svc *v1.Service) error {
 	action := p.getServiceInstanceAction(svc)
 	switch action {
 	case ActionDelete:
-		// remove the label from the node before deleting the service
-		if err := p.nodeLabelManager.RemoveLabel(ctx, svc); err != nil {
-			return fmt.Errorf("error removing label from node: %w", err)
-		}
-
-		log.Debug("[service] delete", "namespace", svc.Namespace, "name", svc.Name, "uid", svc.UID)
+		log.Debug("[service] delete", "namespace", svc.Namespace, "name", svc.Name)
 		if err := p.deleteService(svc.UID); err != nil {
 			return fmt.Errorf("error deleting service %s/%s: %w", svc.Namespace, svc.Name, err)
 		}
 	case ActionAdd:
-		log.Debug("[service] add", "namespace", svc.Namespace, "name", svc.Name, "uid", svc.UID)
+		log.Debug("[service] add", "namespace", svc.Namespace, "name", svc.Name)
 		if err := p.addService(ctx, svc); err != nil {
 			return fmt.Errorf("error adding service %s/%s: %w", svc.Namespace, svc.Name, err)
 		}
-
-		// add the label to the node after adding the service
-		if err := p.nodeLabelManager.AddLabel(ctx, svc); err != nil {
-			return fmt.Errorf("error adding label to node: %w", err)
-		}
 	case ActionNone:
-		log.Debug("[service] no action", "namespace", svc.Namespace, "name", svc.Name, "uid", svc.UID)
+		log.Debug("[service] no action", "namespace", svc.Namespace, "name", svc.Name)
 	}
-	log.Debug("[FINISHED] Service Sync", "namespace", svc.Namespace, "name", svc.Name, "uid", svc.UID)
+	log.Debug("[FINISHED] Service Sync", "namespace", svc.Namespace, "name", svc.Name)
 	return nil
 }

 func (p *Processor) getServiceInstanceAction(svc *v1.Service) ServiceInstanceAction {
 	// protect against multiple calls
-	// get the annotations or legacy values from manual configuration
-	addresses, hostnames := instance.FetchServiceAddresses(svc)
-	// get the status information of the LB Service
-	statusAddresses, _ := instance.FetchLoadBalancerIngress(svc)
+	addresses := instance.FetchServiceAddresses(svc)
+	ingressIPs := instance.FetchLoadBalancerIngressAddresses(svc)
 	p.mutex.Lock()
 	defer p.mutex.Unlock()

@@ -84,22 +70,22 @@ func (p *Processor) getServiceInstanceAction(svc *v1.Service) ServiceInstanceAct
 			for _, address := range addresses {
 				// handle the case where the service instance needs to be deleted
 				if instance.IsDHCP {
-					if address != "0.0.0.0" && address != "::" {
+					if address != "0.0.0.0" {
 						return ActionDelete
 					}
-					if len(svc.Status.LoadBalancer.Ingress) > 0 && !slices.Contains(statusAddresses, instance.DHCPInterfaceIP) {
+					if len(svc.Status.LoadBalancer.Ingress) > 0 && !slices.Contains(ingressIPs, instance.DHCPInterfaceIP) {
 						return ActionDelete
 					}
 				}
 				if !instance.IsDHCP {
-					if address == "0.0.0.0" || address == "::" {
+					if address == "0.0.0.0" {
 						return ActionDelete
 					}
-					if len(svc.Status.LoadBalancer.Ingress) > 0 && !slices.Contains(statusAddresses, address) {
+					if len(svc.Status.LoadBalancer.Ingress) > 0 && !slices.Contains(ingressIPs, address) {
 						return ActionDelete
 					}
 				}
-				if len(svc.Status.LoadBalancer.Ingress) > 0 && !comparePortsAndPortStatuses(svc) {
+				if !comparePortsAndPortStatuses(svc) {
 					return ActionDelete
 				}
 			}
@@ -107,8 +93,8 @@ func (p *Processor) getServiceInstanceAction(svc *v1.Service) ServiceInstanceAct
 			return ActionNone
 		}
 	}
-	if len(addresses) > 0 || len(hostnames) > 0 {
-		log.Debug("no matching service instance found", "service", svc.Name, "namespace", svc.Namespace, "addresses", addresses, "hostnames", hostnames)
+	if len(addresses) > 0 {
+		log.Debug("No matching service instance found", "service", svc.Name, "namespace", svc.Namespace, "addresses", addresses)
 		return ActionAdd // If no matching instance is found, we need to add a new service instance
 	}
 	return ActionNone
@@ -174,7 +160,7 @@ func (p *Processor) addService(ctx context.Context, svc *v1.Service) error {
 		}
 	}

-	serviceIPs, _ := instance.FetchServiceAddresses(svc)
+	serviceIPs := instance.FetchServiceAddresses(svc)
 	// Check if we need to flush any conntrack connections (due to some dangling conntrack connections)
 	if svc.Annotations[kubevip.FlushContrack] == "true" {

@@ -199,13 +185,13 @@ func (p *Processor) addService(ctx context.Context, svc *v1.Service) error {
 			// Ensure that kernel modules are loaded and report back missing modules.
 			err = p.nftablesCheck()
 			if err != nil {
-				log.Warn("[service] configuring nft egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
+				log.Error("[service] configuring egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
 			}
 		} else {
 			// Ensure that kernel modules are loaded and report back missing modules.
 			err = p.iptablesCheck()
 			if err != nil {
-				log.Warn("[service] configuring egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
+				log.Error("[service] configuring egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
 			}
 		}
 		var podIP string
@@ -216,14 +202,14 @@ func (p *Processor) addService(ctx context.Context, svc *v1.Service) error {
 			// Does the service have an active IPv6 endpoint
 			if svc.Annotations[kubevip.ActiveEndpointIPv6] != "" {
 				for _, serviceIP := range serviceIPs {
-					if !p.config.EnableEndpoints && utils.IsIPv6(serviceIP) {
+					if !p.config.EnableEndpoints && vip.IsIPv6(serviceIP) {

 						podIP = svc.Annotations[kubevip.ActiveEndpointIPv6]

 						err = p.configureEgress(serviceIP, podIP, svc.Namespace, string(svc.UID), svc.Annotations)
 						if err != nil {
 							errList = append(errList, err)
-							log.Warn("[service] configuring egress IPv6", "service", svc.Name, "namespace", svc.Namespace, "err", err)
+							log.Error("[service] configuring egress IPv6", "service", svc.Name, "namespace", svc.Namespace, "err", err)
 						}
 					}
 				}
@@ -231,13 +217,13 @@ func (p *Processor) addService(ctx context.Context, svc *v1.Service) error {
 		} else if svc.Annotations[kubevip.ActiveEndpoint] != "" { // Not expected to be IPv6, so should be an IPv4 address
 			for _, serviceIP := range serviceIPs {
 				podIPs := svc.Annotations[kubevip.ActiveEndpoint]
-				if !p.config.EnableEndpoints && utils.IsIPv6(serviceIP) {
+				if !p.config.EnableEndpoints && vip.IsIPv6(serviceIP) {
 					podIPs = svc.Annotations[kubevip.ActiveEndpointIPv6]
 				}
 				err = p.configureEgress(serviceIP, podIPs, svc.Namespace, string(svc.UID), svc.Annotations)
 				if err != nil {
 					errList = append(errList, err)
-					log.Warn("[service] configuring egress IPv4", "service", svc.Name, "namespace", svc.Namespace, "err", err)
+					log.Error("[service] configuring egress IPv4", "service", svc.Name, "namespace", svc.Namespace, "err", err)
 				}
 			}
 		}
@@ -250,7 +236,7 @@ func (p *Processor) addService(ctx context.Context, svc *v1.Service) error {
 			}
 			err = provider.UpdateServiceAnnotation(svc.Annotations[kubevip.ActiveEndpoint], svc.Annotations[kubevip.ActiveEndpointIPv6], svc, p.clientSet)
 			if err != nil {
-				log.Warn("[service] configuring egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
+				log.Error("[service] configuring egress", "service", svc.Name, "namespace", svc.Namespace, "err", err)
 			}
 		}
 	}
@@ -280,12 +266,10 @@ func (p *Processor) deleteService(uid types.UID) error {
 			serviceInstance = p.ServiceInstances[x]
 		}
 	}
-
 	// If we've been through all services and not found the correct one then error
 	if !found {
 		// TODO: - fix UX
 		// return fmt.Errorf("unable to find/stop service [%s]", uid)
-		log.Warn("unable to find/stop service", "uid", uid)
 		return nil
 	}

@@ -299,13 +283,11 @@ func (p *Processor) deleteService(uid types.UID) error {
 	shared := false
 	vipSet := make(map[string]interface{})
 	for x := range updatedInstances {
-		vips, _ := instance.FetchServiceAddresses(updatedInstances[x].ServiceSnapshot)
-		for _, vip := range vips { //updatedInstances[x].ServiceSnapshot.Spec.LoadBalancerIP {
+		for _, vip := range instance.FetchServiceAddresses(updatedInstances[x].ServiceSnapshot) { //updatedInstances[x].ServiceSnapshot.Spec.LoadBalancerIP {
 			vipSet[vip] = nil
 		}
 	}
-	vips, _ := instance.FetchServiceAddresses(serviceInstance.ServiceSnapshot)
-	for _, vip := range vips {
+	for _, vip := range instance.FetchServiceAddresses(serviceInstance.ServiceSnapshot) {
 		if _, found := vipSet[vip]; found {
 			shared = true
 		}
@@ -326,15 +308,9 @@ func (p *Processor) deleteService(uid types.UID) error {
 				return fmt.Errorf("[service] error deleting DHCP Link : %v", err)
 			}
 		}
-
-		if p.config.EnableBGP {
-			endpoints.ClearBGPHostsByInstance(serviceInstance, p.bgpServer)
-		}
-		if p.config.EnableRoutingTable && (p.config.EnableLeaderElection || p.config.EnableServicesElection) {
-			if errs := endpoints.ClearRoutesByInstance(serviceInstance.ServiceSnapshot, serviceInstance, &p.ServiceInstances); len(errs) > 0 {
-				for _, err := range errs {
-					log.Error("unable to clear routes", "err", err)
-				}
+		for i := range serviceInstance.VIPConfigs {
+			if serviceInstance.VIPConfigs[i].EnableBGP {
+				endpoints.ClearBGPHostsByInstance(serviceInstance, p.bgpServer)
 			}
 		}

@@ -353,7 +329,7 @@ func (p *Processor) deleteService(uid types.UID) error {
 	// Update the service array
 	p.ServiceInstances = updatedInstances

-	log.Info("Removed instance from manager", "uid", uid, "name", serviceInstance.ServiceSnapshot.Name, "remaining advertised services", len(p.ServiceInstances))
+	log.Info("Removed instance from manager", "uid", uid, "remaining advertised services", len(p.ServiceInstances))

 	return nil
 }
@@ -377,15 +353,13 @@ func (p *Processor) upnpMap(ctx context.Context, s *instance.Instance) {
 	// Reset Gateway IPs to remove stale addresses
 	s.UPNPGatewayIPs = make([]string, 0)

-	vips, _ := instance.FetchServiceAddresses(s.ServiceSnapshot)
-	for _, vip := range vips {
+	for _, vip := range instance.FetchServiceAddresses(s.ServiceSnapshot) {
 		for _, port := range s.ServiceSnapshot.Spec.Ports {
 			for _, gw := range gateways {
+				log.Info("[UPNP] Adding map", "vip", vip, "port", port.Port, "service", s.ServiceSnapshot.Name, "gateway", gw.WANIPv6FirewallControlClient.Location)

 				forwardSucessful := false
 				if gw.WANIPv6FirewallControlClient != nil {
-					log.Info("[UPNP] Adding map", "vip", vip, "port", port.Port, "service", s.ServiceSnapshot.Name, "gateway", gw.WANIPv6FirewallControlClient.Location)
-
 					pinholeID, pinholeErr := gw.WANIPv6FirewallControlClient.AddPinholeCtx(ctx, "0.0.0.0", uint16(port.Port), vip, uint16(port.Port), upnp.MapProtocolToIANA(string(port.Protocol)), 3600) //nolint  TODO
 					if pinholeErr == nil {
 						forwardSucessful = true
@@ -397,17 +371,9 @@ func (p *Processor) upnpMap(ctx context.Context, s *instance.Instance) {
 				}
 				// Fallback to PortForward
 				if !forwardSucessful {
-					log.Info("[UPNP] Adding map", "vip", vip, "port", port.Port, "service", s.ServiceSnapshot.Name)
-
 					portMappingErr := gw.ConnectionClient.AddPortMapping("0.0.0.0", uint16(port.Port), strings.ToUpper(string(port.Protocol)), uint16(port.Port), vip, true, s.ServiceSnapshot.Name, 3600) //nolint  TODO
 					if portMappingErr == nil {
-						ip, err := gw.ConnectionClient.GetExternalIPAddress()
-						if err != nil {
-							// Log the error but continue on the off chance the mapping was successful
-							log.Error("[UPNP] Unable to get external IP address from gateway", "port", port.Port, "err", err)
-						} else {
-							log.Info("[UPNP] Service should be accessible externally", "port", port.Port, "externalip", ip)
-						}
+						log.Info("[UPNP] Service should be accessible externally", "port", port.Port)
 						forwardSucessful = true
 					} else {
 						//TODO: Cleanup
@@ -452,8 +418,8 @@ func (p *Processor) updateStatus(i *instance.Instance) error {
 			currentServiceCopy.Annotations = make(map[string]string)
 		}

-		// If we're using ARP then we can only broadcast the VIP from one place, also useful for other software when running BGP, add an annotation to the service
-		if p.config.EnableARP || p.config.EnableBGP {
+		// If we're using ARP then we can only broadcast the VIP from one place, add an annotation to the service
+		if p.config.EnableARP {
 			// Add the current host
 			currentServiceCopy.Annotations[kubevip.VipHost] = p.config.NodeName
 		}
@@ -486,8 +452,8 @@ func (p *Processor) updateStatus(i *instance.Instance) error {
 		ingresses := []v1.LoadBalancerIngress{}

 		for _, c := range i.VIPConfigs {
-			if !utils.IsIP(c.VIP) {
-				ips, err := utils.LookupHost(c.VIP, p.config.DNSMode)
+			if !vip.IsIP(c.VIP) {
+				ips, err := vip.LookupHost(c.VIP, p.config.DNSMode)
 				if err != nil {
 					return err
 				}
@@ -518,7 +484,7 @@ func (p *Processor) updateStatus(i *instance.Instance) error {
 		if !cmp.Equal(currentService.Status.LoadBalancer.Ingress, ingresses) {
 			currentService.Status.LoadBalancer.Ingress = ingresses
 			_, err = p.clientSet.CoreV1().Services(currentService.Namespace).UpdateStatus(context.TODO(), currentService, metav1.UpdateOptions{})
-			if err != nil && !apierrors.IsInvalid(err) {
+			if err != nil {
 				log.Error("updating Service", "namespace", i.ServiceSnapshot.Namespace, "name", i.ServiceSnapshot.Name, "err", err)
 				return err
 			}
--- a/pkg/utils/dns.go
+++ b/pkg/utils/dns.go
@@ -1,72 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	IPv4Family = "IPv4"
-	IPv6Family = "IPv6"
-	DualFamily = "dual"
-)
-
-// LookupHost resolves dnsName and return an IP or an error
-func LookupHost(dnsName, dnsMode string) ([]string, error) {
-	result, err := net.LookupHost(dnsName)
-	if err != nil {
-		return nil, err
-	}
-	if len(result) == 0 {
-		return nil, errors.Errorf("empty address for %s", dnsName)
-	}
-	addrs := []string{}
-	switch dnsMode {
-	case strings.ToLower(IPv4Family), strings.ToLower(IPv6Family), DualFamily:
-		a, err := getIPbyFamily(result, dnsMode)
-		if err != nil {
-			return nil, err
-		}
-		addrs = append(addrs, a...)
-	default:
-		addrs = append(addrs, result[0])
-	}
-
-	return addrs, nil
-}
-
-func getIPbyFamily(addresses []string, family string) ([]string, error) {
-	var checkers []func(string) bool
-	families := []string{}
-	if family == DualFamily || family == strings.ToLower(IPv4Family) {
-		checkers = append(checkers, IsIPv4)
-		families = append(families, IPv4Family)
-	}
-	if family == DualFamily || family == strings.ToLower(IPv6Family) {
-		checkers = append(checkers, IsIPv6)
-		families = append(families, IPv6Family)
-	}
-
-	addrs := []string{}
-	for i, c := range checkers {
-		addr, err := getIPbyChecker(addresses, c)
-		if err != nil {
-			return nil, fmt.Errorf("error getting %s address: %w", families[i], err)
-		}
-		addrs = append(addrs, addr)
-	}
-
-	return addrs, nil
-}
-
-func getIPbyChecker(addresses []string, checker func(string) bool) (string, error) {
-	for _, addr := range addresses {
-		if checker(addr) {
-			return addr, nil
-		}
-	}
-	return "", fmt.Errorf("address not found")
-}
--- a/pkg/utils/ip.go
+++ b/pkg/utils/ip.go
@@ -1,58 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"net"
-)
-
-// FormatIPWithSubnetMask takes a raw IP address and a subnet mask, and returns a formatted string in CIDR notation.
-func FormatIPWithSubnetMask(rawIP string, subnetMask string) (string, error) {
-
-	addr := fmt.Sprintf("%s/%s", rawIP, subnetMask)
-	// Check if the input is valid
-	_, _, err := net.ParseCIDR(addr)
-	if err != nil {
-		return "", fmt.Errorf("invalid CIDR: %q, %w", addr, err)
-	}
-	return addr, nil
-}
-
-// IsIP returns if address is an IP or not
-func IsIP(address string) bool {
-	ip := net.ParseIP(address)
-	return ip != nil
-}
-
-// IsIPv4 returns true only if address is a valid IPv4 address
-func IsIPv4(address string) bool {
-	ip := net.ParseIP(address)
-	if ip == nil {
-		return false
-	}
-	return ip.To4() != nil
-}
-
-// IsIPv6 returns true only if address is a valid IPv6 address
-func IsIPv6(address string) bool {
-	ip := net.ParseIP(address)
-	if ip == nil {
-		return false
-	}
-	return ip.To4() == nil
-}
-
-func IsIPv4CIDR(cidr string) bool {
-	ip, _, _ := net.ParseCIDR(cidr)
-	if ip == nil {
-		return false
-	}
-	return ip.To4() != nil
-}
-
-func IsIPv6CIDR(cidr string) bool {
-	ip, _, _ := net.ParseCIDR(cidr)
-	if ip == nil {
-		return false
-	}
-	return ip.To4() == nil
-}
--- a/pkg/utils/netlink.go
+++ b/pkg/utils/netlink.go
@@ -1,55 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/vishvananda/netlink"
-)
-
-// GetInterfaceByIP returns the network interface that has the specified IP address assigned.
-func GetInterfaceByIP(ipAddr string) (*netlink.Link, error) {
-	ip := net.ParseIP(ipAddr)
-	if ip == nil {
-		return nil, fmt.Errorf("invalid IP address: %s", ipAddr)
-	}
-
-	links, err := netlink.LinkList()
-	if err != nil {
-		return nil, fmt.Errorf("failed to list network interfaces: %v", err)
-	}
-
-	for i := range links {
-		addrs, err := netlink.AddrList(links[i], netlink.FAMILY_ALL)
-		if err != nil {
-			return nil, fmt.Errorf("failed to list addresses for interface %s: %v", links[i].Attrs().Name, err)
-		}
-
-		for _, addr := range addrs {
-			if addr.IP.Equal(ip) {
-				return &links[i], nil
-			}
-		}
-	}
-
-	return nil, fmt.Errorf("no interface found with IP address: %s", ipAddr)
-}
-
-// GetNonLinkLocalIP returns the first non link-local IPv4/IPv6 address on the given interface.
-func GetNonLinkLocalIP(iface *netlink.Link, family int) (string, error) {
-	a, err := netlink.AddrList(*iface, family)
-	if err != nil {
-		return "", fmt.Errorf("failed to list addresses for interface %s: %v", (*iface).Attrs().Name, err)
-	}
-
-	for _, addr := range a {
-		if addr.IPNet != nil {
-			ip := addr.IPNet.IP
-			if !ip.IsLinkLocalUnicast() {
-				return ip.String(), nil
-			}
-		}
-	}
-
-	return "", fmt.Errorf("failed to find non-local IP on interface: %s", (*iface).Attrs().Name)
-}
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -1,6 +1,8 @@
 package utils

 import (
+	"fmt"
+	"net"
 	"os"
 )

@@ -11,3 +13,15 @@ func FileExists(filename string) bool {
 	}
 	return !info.IsDir()
 }
+
+// FormatIPWithSubnetMask takes a raw IP address and a subnet mask, and returns a formatted string in CIDR notation.
+func FormatIPWithSubnetMask(rawIP string, subnetMask string) (string, error) {
+
+	addr := fmt.Sprintf("%s/%s", rawIP, subnetMask)
+	// Check if the input is valid
+	_, _, err := net.ParseCIDR(addr)
+	if err != nil {
+		return "", fmt.Errorf("invalid CIDR: %q, %w", addr, err)
+	}
+	return addr, nil
+}
--- a/pkg/vip/address.go
+++ b/pkg/vip/address.go
@@ -18,23 +18,20 @@ import (
 	v1 "k8s.io/api/core/v1"

 	"github.com/kube-vip/kube-vip/pkg/iptables"
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/kube-vip/kube-vip/pkg/utils"
-
 	"github.com/kube-vip/kube-vip/pkg/networkinterface"
+	"github.com/kube-vip/kube-vip/pkg/utils"
 )

 const (
-	defaultValidLft         = 60
-	iptablesComment         = "%s kube-vip load balancer IP"
-	iptablesCommentMarkRule = "kube-vip load balancer IP set mark for masquerade"
-	defaultMaskIPv6         = 128
-	defaultMaskIPv4         = 32
+	defaultValidLft                 = 60
+	iptablesComment                 = "%s kube-vip load balancer IP"
+	iptablesCommentMarkRule         = "kube-vip load balancer IP set mark for masquerade"
+	ignoreServiceSecurityAnnotation = "kube-vip.io/ignore-service-security"
 )

 // Network is an interface that enable managing operations for a given IP
 type Network interface {
-	AddIP(precheck bool, skipDAD bool) (bool, error)
+	AddIP(precheck bool) (bool, error)
 	AddRoute(precheck bool) error
 	DeleteIP() (bool, error)
 	DeleteRoute() error
@@ -97,7 +94,7 @@ func NewConfig(address string, iface string, loGlobalScope bool, subnet string,

 	networkLink := intfMgr.Get(link)

-	if utils.IsIP(address) {
+	if IsIP(address) {
 		result := &network{
 			link:             networkLink,
 			routeTable:       tableID,
@@ -137,8 +134,7 @@ func NewConfig(address string, iface string, loGlobalScope bool, subnet string,
 		networks = append(networks, result)
 	} else {
 		// try to resolve the address
-		log.Debug("looking up host", "address", address, "dnsMode", dnsMode)
-		ips, err := utils.LookupHost(address, dnsMode)
+		ips, err := LookupHost(address, dnsMode)
 		if err != nil {
 			// return early for ddns if no IP is allocated for the domain
 			// when leader starts, should do get IP from DHCP for the domain
@@ -154,18 +150,8 @@ func NewConfig(address string, iface string, loGlobalScope bool, subnet string,
 					dnsName:          address,
 					ipvsEnabled:      ipvsEnabled,
 					enableSecurity:   enableSecurity,
-					address: &netlink.Addr{ // create placeholder for the address
-						IPNet: &net.IPNet{}, // that will be added later in the process
-						Peer:  &net.IPNet{},
-					},
 				}

-				// set address as deprecated so it isn't used as source address according to RFC 3484
-				result.address.PreferedLft = 0
-
-				// Also set ValidLft so the netlink library actually sets them
-				result.address.ValidLft = math.MaxInt
-
 				networks = append(networks, result)
 				return networks, nil
 			}
@@ -188,14 +174,7 @@ func NewConfig(address string, iface string, loGlobalScope bool, subnet string,

 			// we're able to resolve store this as the initial IP

-			subnets := Split(subnet)
-
-			s := subnet
-			if len(subnets) > 1 {
-				s = selectSubnet(ip, subnets)
-			}
-
-			if result.address, err = netlink.ParseAddr(fmt.Sprintf("%s/%s", ip, s)); err != nil {
+			if result.address, err = netlink.ParseAddr(fmt.Sprintf("%s/%s", ip, subnet)); err != nil {
 				return networks, err
 			}
 			// set ValidLft so that the VIP expires if the DNS entry is updated, otherwise it'll be refreshed by the DNS prober
@@ -329,9 +308,7 @@ func (configurator *network) UpdateRoutes() (bool, error) {
 }

 // AddIP - Add an IP address to the interface
-// precheck: if true, check if the IP already exists before adding
-// skipDAD: if true, set IFA_F_NODAD flag for IPv6 addresses to skip Duplicate Address Detection
-func (configurator *network) AddIP(precheck bool, skipDAD bool) (bool, error) {
+func (configurator *network) AddIP(precheck bool) (bool, error) {
 	configurator.link.Lock.Lock()
 	defer configurator.link.Lock.Unlock()
 	exists := false
@@ -346,15 +323,6 @@ func (configurator *network) AddIP(precheck bool, skipDAD bool) (bool, error) {
 		return false, nil
 	}

-	// For IPv6 addresses, optionally set NODAD flag to skip Duplicate Address Detection (DAD)
-	// This prevents DADFAILED loops when recovering from a previous DADFAILED state
-	// The flag tells the kernel to skip DAD, which is safe when we're re-adding
-	// an address that we know should be ours (e.g., after DADFAILED recovery)
-	if skipDAD && utils.IsIPv6(configurator.address.IP.String()) {
-		configurator.address.Flags |= unix.IFA_F_NODAD
-		log.Debug("Setting IFA_F_NODAD flag for IPv6 address to skip DAD", "ip", configurator.address.IP.String())
-	}
-
 	if err := netlink.AddrReplace(configurator.link.Intf, configurator.address); err != nil {
 		return false, errors.Wrap(err, "could not add ip")
 	}
@@ -612,7 +580,7 @@ func (configurator *network) IsDADFAIL() bool {
 	configurator.link.Lock.Lock()
 	defer configurator.link.Lock.Unlock()

-	if configurator.address == nil || !utils.IsIPv6(configurator.address.IP.String()) {
+	if configurator.address == nil || !IsIPv6(configurator.address.IP.String()) {
 		return false
 	}

@@ -644,10 +612,6 @@ func (configurator *network) IsSet() (result bool, err error) {
 		return false, nil
 	}

-	if configurator.address.Mask == nil {
-		return false, nil
-	}
-
 	addresses, err = netlink.AddrList(configurator.link.Intf, 0)
 	if err != nil {
 		err = errors.Wrap(err, "could not list addresses")
@@ -705,7 +669,7 @@ func (configurator *network) SetServicePorts(service *v1.Service) {

 	configurator.ports = service.Spec.Ports
 	configurator.serviceName = service.Namespace + "/" + service.Name
-	configurator.ignoreSecurity = service.Annotations[kubevip.ServiceSecurityIgnore] == "true"
+	configurator.ignoreSecurity = service.Annotations[ignoreServiceSecurityAnnotation] == "true"
 }

 // IP - return the IP Address
@@ -713,10 +677,6 @@ func (configurator *network) IP() string {
 	configurator.mu.Lock()
 	defer configurator.mu.Unlock()

-	if configurator.address == nil || configurator.address.IP == nil {
-		return ""
-	}
-
 	return configurator.address.IP.String()
 }

@@ -724,10 +684,6 @@ func (configurator *network) CIDR() string {
 	configurator.mu.Lock()
 	defer configurator.mu.Unlock()

-	if configurator.address == nil || configurator.address.IPNet == nil {
-		return ""
-	}
-
 	return configurator.address.IPNet.String()
 }

@@ -801,14 +757,9 @@ func GarbageCollect(adapter, address string, intfMgr *networkinterface.Manager)
 }

 func (configurator *network) SetMask(mask string) error {
-	selectedMask := mask
-	var err error
-
-	if configurator.IP() != "" {
-		selectedMask, err = SelectSubnet(configurator.IP(), mask)
-		if err != nil {
-			return fmt.Errorf("failed to select mask %q: %w", mask, err)
-		}
+	selectedMask, err := SelectSubnet(configurator.IP(), mask)
+	if err != nil {
+		return fmt.Errorf("failed to select mask %q: %w", mask, err)
 	}

 	m, err := strconv.Atoi(selectedMask)
@@ -816,19 +767,16 @@ func (configurator *network) SetMask(mask string) error {
 		return err
 	}

-	size := defaultMaskIPv4
-	family := utils.IPv4Family
+	size := 32
+	family := "IPv4"

-	if configurator.IP() != "" {
-		if utils.IsIPv6(configurator.IP()) {
-			size = defaultMaskIPv6
-			family = utils.IPv6Family
-		}
-
-		if m > size {
-			return fmt.Errorf("provided CIDR mask '%d' is greater than the highest mask value for the %s family (%d)", m, family, size)
-		}
+	if IsIPv6(configurator.IP()) {
+		size = 128
+		family = "IPv6"
+	}

+	if m > size {
+		return fmt.Errorf("provided CIDR mask '%d' is greater than the highest mask value for the %s family (%d)", m, family, size)
 	}

 	toSet := net.CIDRMask(m, size)
--- a/pkg/vip/dns.go
+++ b/pkg/vip/dns.go
@@ -5,8 +5,6 @@ import (
 	"time"

 	log "log/slog"
-
-	"github.com/kube-vip/kube-vip/pkg/utils"
 )

 // IPUpdater is the interface to plug dns updaters
@@ -35,24 +33,23 @@ func (d *ipUpdater) Run(ctx context.Context) {
 				return
 			default:
 				mode := "ipv4"
-				if utils.IsIPv6(d.vip.IP()) {
+				if IsIPv6(d.vip.IP()) {
 					mode = "ipv6"
 				}

-				ip, err := utils.LookupHost(d.vip.DNSName(), mode)
+				ip, err := LookupHost(d.vip.DNSName(), mode)
 				if err != nil {
 					log.Warn("cannot lookup", "name", d.vip.DNSName(), "err", err)
 					// fallback to renewing the existing IP
 					ip = []string{d.vip.IP()}
 				}

-				log.Debug("setting IP", "address", ip)
+				log.Info("setting IP", "address", ip)
 				if err := d.vip.SetIP(ip[0]); err != nil {
 					log.Error("setting IP", "address", ip, "err", err)
 				}

-				// Normal VIP addition for DNS, use skipDAD=false for normal DAD process
-				if _, err := d.vip.AddIP(false, false); err != nil {
+				if _, err := d.vip.AddIP(false); err != nil {
 					log.Error("error adding virtual IP", "err", err)
 				}

--- a/pkg/vip/egress.go
+++ b/pkg/vip/egress.go
@@ -8,7 +8,6 @@ import (
 	log "log/slog"

 	iptables "github.com/kube-vip/kube-vip/pkg/iptables"
-	"github.com/kube-vip/kube-vip/pkg/utils"

 	ct "github.com/florianl/go-conntrack"
 )
@@ -37,9 +36,9 @@ type Egress struct {
 }

 func CreateIptablesClient(nftables bool, namespace string, protocol iptables.Protocol) (*Egress, error) {
-	proto := utils.IPv4Family
+	proto := "IPv4"
 	if protocol == iptables.ProtocolIPv6 {
-		proto = utils.IPv6Family
+		proto = "IPv6"
 	}
 	log.Info("[egress] Creating an iptables client", "nftables", nftables, "protocol", proto)
 	e := new(Egress)
--- a/pkg/vip/util.go
+++ b/pkg/vip/util.go
@@ -5,17 +5,78 @@ import (
 	"crypto/rand"
 	"fmt"
 	"net"
-	"strconv"
 	"strings"
 	"syscall"

 	log "log/slog"

-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
 )

+// LookupHost resolves dnsName and return an IP or an error
+func LookupHost(dnsName, dnsMode string) ([]string, error) {
+	result, err := net.LookupHost(dnsName)
+	if err != nil {
+		return nil, err
+	}
+	if len(result) == 0 {
+		return nil, errors.Errorf("empty address for %s", dnsName)
+	}
+	addrs := []string{}
+	switch dnsMode {
+	case "ipv4", "ipv6", "dual":
+		a, err := getIPbyFamily(result, dnsMode)
+		if err != nil {
+			return nil, err
+		}
+		addrs = append(addrs, a...)
+	default:
+		addrs = append(addrs, result[0])
+	}
+
+	return addrs, nil
+}
+
+func getIPbyFamily(addresses []string, family string) ([]string, error) {
+	var checkers []func(string) bool
+	families := []string{}
+	if family == "dual" || family == "ipv4" {
+		checkers = append(checkers, IsIPv4)
+		families = append(families, "IPv4")
+	}
+	if family == "dual" || family == "ipv6" {
+		checkers = append(checkers, IsIPv6)
+		families = append(families, "IPv6")
+	}
+
+	addrs := []string{}
+	for i, c := range checkers {
+		addr, err := getIPbyChecker(addresses, c)
+		if err != nil {
+			return nil, fmt.Errorf("error getting %s address: %w", families[i], err)
+		}
+		addrs = append(addrs, addr)
+	}
+
+	return addrs, nil
+}
+
+func getIPbyChecker(addresses []string, checker func(string) bool) (string, error) {
+	for _, addr := range addresses {
+		if checker(addr) {
+			return addr, nil
+		}
+	}
+	return "", fmt.Errorf("address not found")
+}
+
+// IsIP returns if address is an IP or not
+func IsIP(address string) bool {
+	ip := net.ParseIP(address)
+	return ip != nil
+}
+
 // getHostName return the hostname from the fqdn
 func getHostName(dnsName string) string {
 	if dnsName == "" {
@@ -26,6 +87,40 @@ func getHostName(dnsName string) string {
 	return fields[0]
 }

+// IsIPv4 returns true only if address is a valid IPv4 address
+func IsIPv4(address string) bool {
+	ip := net.ParseIP(address)
+	if ip == nil {
+		return false
+	}
+	return ip.To4() != nil
+}
+
+// IsIPv6 returns true only if address is a valid IPv6 address
+func IsIPv6(address string) bool {
+	ip := net.ParseIP(address)
+	if ip == nil {
+		return false
+	}
+	return ip.To4() == nil
+}
+
+func IsIPv4CIDR(cidr string) bool {
+	ip, _, _ := net.ParseCIDR(cidr)
+	if ip == nil {
+		return false
+	}
+	return ip.To4() != nil
+}
+
+func IsIPv6CIDR(cidr string) bool {
+	ip, _, _ := net.ParseCIDR(cidr)
+	if ip == nil {
+		return false
+	}
+	return ip.To4() == nil
+}
+
 // GetDefaultGatewayInterface return default gateway interface link
 func GetDefaultGatewayInterface() (*net.Interface, error) {
 	routes, err := netlink.RouteList(nil, syscall.AF_INET)
@@ -144,22 +239,3 @@ func GetNonLinkLocalIP(iface *netlink.Link, family int) (string, error) {

 	return "", fmt.Errorf("failed to find non-local IP on interface: %s", (*iface).Attrs().Name)
 }
-
-func selectSubnet(address string, subnets []string) string {
-	subnet := ""
-	if utils.IsIPv4(address) {
-		if subnets[0] != "" {
-			subnet = subnets[0]
-		} else {
-			subnet = strconv.Itoa(defaultMaskIPv4)
-		}
-	} else {
-		if len(subnets) > 1 && subnets[1] != "" {
-			subnet = subnets[1]
-		} else {
-			subnet = strconv.Itoa(defaultMaskIPv6)
-		}
-	}
-
-	return subnet
-}
--- a/test.sh
+++ b/test.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/bash
+
+rm -f logs.txt
+
+for i in $(seq 1 100);
+do
+  echo "RUN $i"
+  GOMAXPROCS=4 make e2e-tests129
+  if [[ "$?" -ne 0 ]]; then 
+    echo "FAILED AT RUN $i"
+    break
+  fi
+done
--- a/testing/e2e/e2e_bgp_test.go
+++ b/testing/e2e/e2e_bgp_test.go
@@ -29,7 +29,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 	"github.com/kube-vip/kube-vip/testing/e2e"
 	"github.com/kube-vip/kube-vip/testing/services/pkg/deployment"
@@ -57,12 +56,12 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 			configPath                 string
 			kubeVIPBGPManifestTemplate *template.Template
 			goBGPConfigTemplate        *template.Template
+			tempDirPath                string
 			v129                       bool
 			localIPv4                  string
 			localIPv6                  string
 			curDir                     string
 			networkInterface           string
-			tempDirPathRoot            string

 			bgpKill chan any
 		)
@@ -90,7 +89,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 			kubeVIPBGPManifestTemplate, err = template.New("kube-vip-bgp.yaml.tmpl").ParseFiles(templateBGPPath)
 			Expect(err).NotTo(HaveOccurred())

-			tempDirPathRoot, err = os.MkdirTemp("", "kube-vip-test-bgp")
+			tempDirPath, err = os.MkdirTemp("", "kube-vip-test")
 			Expect(err).NotTo(HaveOccurred())
 			v4addr, _, err := deployment.GetLocalIPv4(networkInterface)
 			Expect(err).ToNot(HaveOccurred())
@@ -110,9 +109,9 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 			goBGPConfigTemplate, err = template.New("config.toml.tmpl").ParseFiles(goBGPConfigPath)
 			Expect(err).ToNot(HaveOccurred())

-			goBGPConfigPath = filepath.Join(tempDirPathRoot, "config.toml")
+			goBGPConfigPath = filepath.Join(tempDirPath, "config.toml")

-			f, err := os.OpenFile(goBGPConfigPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
+			f, err := os.OpenFile(goBGPConfigPath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
 			Expect(err).ToNot(HaveOccurred())
 			defer f.Close()

@@ -124,9 +123,6 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 		AfterAll(func() {
 			close(bgpKill)
-			if os.Getenv("E2E_KEEP_LOGS") != "true" {
-				Expect(os.RemoveAll(tempDirPathRoot)).To(Succeed())
-			}
 		})

 		Describe("kube-vip IPv4 services BGP mode functionality", Ordered, func() {
@@ -137,39 +133,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath,
-					k8sImagePath, utils.IPv4Family, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129,
-					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4", false)
+				setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath,
+					k8sImagePath, e2e.IPv4Family, e2e.IPv4Family, []string{e2e.IPv4Family}, &client, &gobgpPeers, v129,
+					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, p := range gobgpPeers {
-					Eventually(func() error {
-						_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-							Address: p.IP,
-						})
-						return err
-					}, "30s", "200ms").Should(Succeed())
+					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
+						Address: p.IP,
+					})
+					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv4 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, "", "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, "")
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -177,8 +163,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, "")
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -193,37 +178,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath,
-					k8sImagePath, utils.IPv6Family, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129,
-					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4", false)
+				setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath,
+					k8sImagePath, e2e.IPv6Family, e2e.IPv6Family, []string{e2e.IPv6Family}, &client, &gobgpPeers, v129,
+					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, p := range gobgpPeers {
 					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
 						Address: p.IP,
 					})
 					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv6 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, "", "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, "")
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -231,8 +208,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, "")
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -247,37 +223,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamily, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "fixed", "mpbgp-ipv4", false)
+				setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
+					e2e.DualstackFamily, e2e.IPv4Family, []string{e2e.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
+					logger, nodesNumber, "fixed", "mpbgp-ipv4")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, p := range gobgpPeers {
 					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
 						Address: p.IP,
 					})
 					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv6 routes over IPv4 session",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv6, "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv6)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -285,8 +253,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv6, "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv6)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -301,37 +268,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamilyIPv6, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "fixed", "mpbgp-ipv6", false)
+				setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
+					e2e.DualstackFamilyIPv6, e2e.IPv6Family, []string{e2e.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
+					logger, nodesNumber, "fixed", "mpbgp-ipv6")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, n := range gobgpPeers {
 					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
 						Address: n.IP,
 					})
 					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv4 routes over IPv6 session",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv4, "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv4)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -339,8 +298,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv4, "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv4)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -356,37 +314,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
 				containerIP    string
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				_, containerIP = setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamily, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv4", false)
+				_, containerIP = setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
+					e2e.DualstackFamily, e2e.IPv4Family, []string{e2e.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
+					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv4")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, p := range gobgpPeers {
 					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
 						Address: p.IP,
 					})
 					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv6 routes over IPv4 session",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, containerIP, "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, containerIP)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -394,8 +344,7 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "")
+					testBGP(offset, e2e.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, containerIP)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -411,37 +360,29 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {
 				gobgpClient    api.GobgpApiClient
 				gobgpPeers     []*e2e.BGPPeerValues
 				containerIP    string
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				containerIP, _ = setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamilyIPv6, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv6", false)
+				containerIP, _ = setupEnv(&tempDirPath, &cpVIP, &clusterName, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
+					e2e.DualstackFamilyIPv6, e2e.IPv6Family, []string{e2e.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
+					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv6")
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
 				for _, n := range gobgpPeers {
 					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
 						Address: n.IP,
 					})
 					Expect(err).ToNot(HaveOccurred())
 				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("advertise IPv4 routes over IPv6 session",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, containerIP, "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 1, gobgpClient, containerIP)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -449,415 +390,39 @@ var _ = Describe("kube-vip BGP mode", Ordered, func() {

 			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "")
+					testBGP(offset, e2e.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName, trafficPolicy, client, 2, gobgpClient, containerIP)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
 			)
 		})
-
-		Describe("kube-vip IPv4 services BGP mode functionality", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath,
-					k8sImagePath, utils.IPv4Family, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129,
-					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, p := range gobgpPeers {
-					Eventually(func() error {
-						_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-							Address: p.IP,
-						})
-						return err
-					}, "30s", "200ms").Should(Succeed())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv4 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, "", "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip IPv6 services BGP mode functionality", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath,
-					k8sImagePath, utils.IPv6Family, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129,
-					kubeVIPBGPManifestTemplate, &gobgpClient, logger, nodesNumber, "", "bgp-ipv4", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, p := range gobgpPeers {
-					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-						Address: p.IP,
-					})
-					Expect(err).ToNot(HaveOccurred())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv6 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, "", "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, "", "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services BGP mode functionality with MP-BGP IPv6 over IPv4 - fixed nexthop", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamily, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "fixed", "mpbgp-ipv4", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, p := range gobgpPeers {
-					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-						Address: p.IP,
-					})
-					Expect(err).ToNot(HaveOccurred())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv6 routes over IPv4 session",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv6, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv6, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were delete while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv6, "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services BGP mode functionality with MP-BGP IPv4 over IPv6 - fixed nexthop", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamilyIPv6, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "fixed", "mpbgp-ipv6", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, n := range gobgpPeers {
-					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-						Address: n.IP,
-					})
-					Expect(err).ToNot(HaveOccurred())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv4 routes over IPv6 session",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, defaultFixedNexthopv4, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv4, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, defaultFixedNexthopv4, "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services BGP mode functionality with MP-BGP IPv6 over IPv4 - auto_sourceif nexthop", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				containerIP    string
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				_, containerIP = setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamily, utils.IPv4Family, []string{utils.IPv4Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv4", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, p := range gobgpPeers {
-					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-						Address: p.IP,
-					})
-					Expect(err).ToNot(HaveOccurred())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv6 routes over IPv4 session",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, containerIP, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv6Family, api.Family_AFI_IP6, []corev1.IPFamily{corev1.IPv6Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services BGP mode functionality with MP-BGP IPv4 over IPv6 - fixed nexthop", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				gobgpClient    api.GobgpApiClient
-				gobgpPeers     []*e2e.BGPPeerValues
-				containerIP    string
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-				containerIP, _ = setupEnv(&cpVIP, &clusterName, tempDirPath, manifestValues, localIPv4, localIPv6, imagePath, configPath, k8sImagePath,
-					e2e.DualstackFamilyIPv6, utils.IPv6Family, []string{utils.IPv6Family}, &client, &gobgpPeers, v129, kubeVIPBGPManifestTemplate, &gobgpClient,
-					logger, nodesNumber, "auto_sourceif", "mpbgp-if-ipv6", true)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				for _, n := range gobgpPeers {
-					_, err := gobgpClient.DeletePeer(context.TODO(), &api.DeletePeerRequest{
-						Address: n.IP,
-					})
-					Expect(err).ToNot(HaveOccurred())
-				}
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("advertise IPv4 routes over IPv6 session",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 1, gobgpClient, containerIP, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only stops advertising route if it was referenced by multiple services and all of them were deleted while using common lease",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					testBGP(offset, utils.IPv4Family, api.Family_AFI_IP, []corev1.IPFamily{corev1.IPv4Protocol}, svcName,
-						trafficPolicy, client, 2, gobgpClient, containerIP, "common-lease")
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
 	}
 })

 func testBGP(offset uint, lbFamily string, afiFamily api.Family_Afi, svcFamily []corev1.IPFamily, svcName string,
-	trafficPolicy corev1.ServiceExternalTrafficPolicy, client kubernetes.Interface, numberOfServices int,
-	gobgpClient api.GobgpApiClient, expectedNexthop string, serviceLease string) {
+	trafficPolicy corev1.ServiceExternalTrafficPolicy, client kubernetes.Interface, numberOfServices int, gobgpClient api.GobgpApiClient, expectedNexthop string) {
 	lbAddress := e2e.GenerateVIP(lbFamily, offset)
 	routeCheckFamily := &api.Family{
 		Afi:  afiFamily,
 		Safi: api.Family_SAFI_UNICAST,
 	}
-	testServiceBGP(svcName, lbAddress, trafficPolicy, client, svcFamily, numberOfServices, gobgpClient, routeCheckFamily, expectedNexthop, serviceLease)
+	testServiceBGP(svcName, lbAddress, trafficPolicy, client, svcFamily, numberOfServices, gobgpClient, routeCheckFamily, expectedNexthop)
 }

-func setupEnv(cpVIP, clusterName *string, tempDirPath string, manifestValues *e2e.KubevipManifestValues,
+func setupEnv(tempDirPath, cpVIP, clusterName *string, manifestValues *e2e.KubevipManifestValues,
 	localIPv4, localIPv6, imagePath, configPath, k8sImagePath, clusterAddrFamily, bgpClientAddrFamily string, peerAddrFamily []string, client *kubernetes.Interface,
 	gobgpPeers *[]*e2e.BGPPeerValues, v129 bool, kubeVIPBGPManifestTemplate *template.Template, gobgpClient *api.GobgpApiClient,
-	logger log.Logger, nodesNumber int, mpbgpnexthop, clusterNameSuffix string, serviceElection bool) (string, string) {
+	logger log.Logger, nodesNumber int, mpbgpnexthop, clusterNameSuffix string) (string, string) {
 	var err error
+	*tempDirPath, err = os.MkdirTemp("", "kube-vip-test")
+	Expect(err).ToNot(HaveOccurred())

 	*cpVIP = e2e.GenerateVIP(clusterAddrFamily, SOffset.Get())

 	var clusterIPFamily kindconfigv1alpha4.ClusterIPFamily
 	var podSubnet, serviceSubnet string
 	switch clusterAddrFamily {
-	case utils.IPv6Family:
+	case e2e.IPv6Family:
 		clusterIPFamily = kindconfigv1alpha4.IPv6Family
 	case e2e.DualstackFamily:
 		clusterIPFamily = kindconfigv1alpha4.DualStackFamily
@@ -879,19 +444,19 @@ func setupEnv(cpVIP, clusterName *string, tempDirPath string, manifestValues *e2
 	}

 	kvPeers := []*e2e.BGPPeerValues{}
-	if slices.Contains(peerAddrFamily, utils.IPv4Family) {
+	if slices.Contains(peerAddrFamily, e2e.IPv4Family) {
 		kvPeers = append(kvPeers, &e2e.BGPPeerValues{
 			IP:       localIPv4,
 			AS:       goBGPAS,
-			IPFamily: utils.IPv4Family,
+			IPFamily: e2e.IPv4Family,
 		})
 	}

-	if slices.Contains(peerAddrFamily, utils.IPv6Family) {
+	if slices.Contains(peerAddrFamily, e2e.IPv6Family) {
 		kvPeers = append(kvPeers, &e2e.BGPPeerValues{
 			IP:       localIPv6,
 			AS:       goBGPAS,
-			IPFamily: utils.IPv6Family,
+			IPFamily: e2e.IPv6Family,
 		})
 	}

@@ -906,8 +471,7 @@ func setupEnv(cpVIP, clusterName *string, tempDirPath string, manifestValues *e2
 		ConfigPath:         configPath,
 		ControlPlaneEnable: "false",
 		SvcEnable:          "true",
-		SvcElectionEnable:  fmt.Sprintf("%t", serviceElection),
-		EnableNodeLabeling: "false",
+		SvcElectionEnable:  "false",
 		BGPAS:              kubevipAS,
 		BGPPeers:           strings.Join(kvPeersStr, ","),
 		MPBGPNexthop:       mpbgpnexthop,
@@ -917,31 +481,30 @@ func setupEnv(cpVIP, clusterName *string, tempDirPath string, manifestValues *e2

 	By(manifestValues.BGPPeers)

-	*clusterName, *client, _ = prepareCluster(tempDirPath, clusterNameSuffix, k8sImagePath, v129,
-		kubeVIPBGPManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+	*clusterName, *client = prepareCluster(*tempDirPath, clusterNameSuffix, k8sImagePath, v129, kubeVIPBGPManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)

 	container := fmt.Sprintf("%s-control-plane", *clusterName)

 	containerIPv4, containerIPv6, err := GetContainerIPs(container)
 	Expect(err).ToNot(HaveOccurred())

-	if slices.Contains(peerAddrFamily, utils.IPv4Family) {
+	if slices.Contains(peerAddrFamily, e2e.IPv4Family) {
 		*gobgpPeers = append(*gobgpPeers, &e2e.BGPPeerValues{
 			IP:       containerIPv4,
 			AS:       kubevipAS,
-			IPFamily: utils.IPv4Family,
+			IPFamily: e2e.IPv4Family,
 		})
 	}

-	if slices.Contains(peerAddrFamily, utils.IPv6Family) {
+	if slices.Contains(peerAddrFamily, e2e.IPv6Family) {
 		*gobgpPeers = append(*gobgpPeers, &e2e.BGPPeerValues{
 			IP:       containerIPv6,
 			AS:       kubevipAS,
-			IPFamily: utils.IPv6Family,
+			IPFamily: e2e.IPv6Family,
 		})
 	}

-	if bgpClientAddrFamily == utils.IPv6Family {
+	if bgpClientAddrFamily == e2e.IPv6Family {
 		*gobgpClient, err = newGoBGPClient(localIPv6, goBGPPort)
 	} else {
 		*gobgpClient, err = newGoBGPClient(localIPv4, goBGPPort)
@@ -990,8 +553,7 @@ func setupEnv(cpVIP, clusterName *string, tempDirPath string, manifestValues *e2

 func testServiceBGP(svcName, lbAddress string, trafficPolicy corev1.ServiceExternalTrafficPolicy,
 	client kubernetes.Interface, serviceAddrFamily []corev1.IPFamily, numberOfServices int,
-	gobgpClient api.GobgpApiClient, gobgpFamily *api.Family, expectedNexthop string,
-	serviceLease string) {
+	gobgpClient api.GobgpApiClient, gobgpFamily *api.Family, expectedNexthop string) {
 	lbAddresses := vip.Split(lbAddress)

 	services := []string{}
@@ -1001,15 +563,11 @@ func testServiceBGP(svcName, lbAddress string, trafficPolicy corev1.ServiceExter

 	for _, svc := range services {
 		createTestService(svc, dsNamespace, dsName, lbAddress,
-			client, corev1.IPFamilyPolicyPreferDualStack, serviceAddrFamily, trafficPolicy, serviceLease, 80)
-		time.Sleep(time.Second)
+			client, corev1.IPFamilyPolicyPreferDualStack, serviceAddrFamily, trafficPolicy)
 	}

 	for _, addr := range lbAddresses {
-		By(withTimestamp(fmt.Sprintf("checking bgp route for address %q", addr)))
 		paths := checkGoBGPPaths(context.Background(), gobgpClient, gobgpFamily, []*api.TableLookupPrefix{{Prefix: addr}}, 1)
-		Expect(paths).ToNot(BeNil())
-		Expect(paths).ToNot(BeEmpty())
 		Expect(strings.Contains(paths[0].Prefix, lbAddress)).To(BeTrue())
 		if expectedNexthop != "" {
 			Expect(strings.Contains(paths[0].String(), fmt.Sprintf("next_hop:\"%s\"", expectedNexthop)) || strings.Contains(paths[0].String(), fmt.Sprintf("next_hops:\"%s\"", expectedNexthop))).To(BeTrue())
@@ -1017,16 +575,11 @@ func testServiceBGP(svcName, lbAddress string, trafficPolicy corev1.ServiceExter
 	}

 	for i := range numberOfServices {
-		By(withTimestamp(fmt.Sprintf("deleting service '%s/%s'", dsNamespace, services[i])))
 		err := client.CoreV1().Services(dsNamespace).Delete(context.TODO(), services[i], metav1.DeleteOptions{})
 		Expect(err).ToNot(HaveOccurred())
-		time.Sleep(time.Second)
 		if i < numberOfServices-1 {
 			for _, addr := range lbAddresses {
-				By(withTimestamp(fmt.Sprintf("checking bgp route for address %q", addr)))
 				paths := checkGoBGPPaths(context.Background(), gobgpClient, gobgpFamily, []*api.TableLookupPrefix{{Prefix: addr}}, 1)
-				Expect(paths).ToNot(BeNil())
-				Expect(paths).ToNot(BeEmpty())
 				Expect(strings.Contains(paths[0].Prefix, lbAddress)).To(BeTrue())
 				if expectedNexthop != "" {
 					Expect(strings.Contains(paths[0].String(), fmt.Sprintf("next_hop:\"%s\"", expectedNexthop)) || strings.Contains(paths[0].String(), fmt.Sprintf("next_hops:\"%s\"", expectedNexthop))).To(BeTrue())
@@ -1036,7 +589,6 @@ func testServiceBGP(svcName, lbAddress string, trafficPolicy corev1.ServiceExter
 	}

 	for _, addr := range lbAddresses {
-		By(withTimestamp(fmt.Sprintf("checking bgp route for address %q - should be deleted", addr)))
 		checkGoBGPPaths(context.Background(), gobgpClient, gobgpFamily, []*api.TableLookupPrefix{{Prefix: addr}}, 0)
 	}
 }
@@ -1077,25 +629,6 @@ func newGoBGPClient(address string, port uint32) (api.GobgpApiClient, error) {
 }

 func checkGoBGPPaths(ctx context.Context, client api.GobgpApiClient, family *api.Family, prefixes []*api.TableLookupPrefix, expectedPaths int) []*api.Destination {
-	// ticker := time.NewTicker(time.Second)
-	// defer ticker.Stop()
-	// to := time.NewTimer(time.Second * 180)
-	// defer to.Stop()
-	// for {
-	// 	select {
-	// 	case <-to.C:
-	// 		return nil
-	// 	case <-ticker.C:
-	// 		paths, err := getGoBGPPaths(ctx, client, family, prefixes)
-	// 		if err != nil {
-	// 			return nil
-	// 		}
-	// 		if len(paths) == expectedPaths {
-	// 			return paths
-	// 		}
-	// 	}
-	// }
-
 	var paths []*api.Destination
 	Eventually(func() error {
 		var err error
@@ -1107,7 +640,7 @@ func checkGoBGPPaths(ctx context.Context, client api.GobgpApiClient, family *api
 			return fmt.Errorf("expected %d paths, but found %d", expectedPaths, len(paths))
 		}
 		return nil
-	}, "360s", "1s").ShouldNot(HaveOccurred())
+	}, "120s").ShouldNot(HaveOccurred())
 	return paths
 }

--- a/testing/e2e/e2e_rt_test.go
+++ b/testing/e2e/e2e_rt_test.go
@@ -23,13 +23,12 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/pkg/vip"
 	"github.com/kube-vip/kube-vip/testing/e2e"
 	"github.com/kube-vip/kube-vip/testing/services/pkg/deployment"
 )

-var _ = Describe("kube-vip routing table mode", Ordered, func() {
+var _ = Describe("kube-vip routing table mode", func() {
 	if Mode == ModeRT {
 		var (
 			logger                              log.Logger
@@ -37,16 +36,10 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			k8sImagePath                        string
 			configPath                          string
 			kubeVIPRoutingTableManifestTemplate *template.Template
-			tempDirPathRoot                     string
+			tempDirPath                         string
 			v129                                bool
 		)

-		BeforeAll(func() {
-			var err error
-			tempDirPathRoot, err = os.MkdirTemp("", "kube-vip-test-rt")
-			Expect(err).NotTo(HaveOccurred())
-		})
-
 		BeforeEach(func() {
 			klog.SetOutput(GinkgoWriter)
 			logger = e2e.TestLogger{}
@@ -64,26 +57,21 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			templateRoutingTablePath := filepath.Join(curDir, "kube-vip-routing-table.yaml.tmpl")
 			kubeVIPRoutingTableManifestTemplate, err = template.New("kube-vip-routing-table.yaml.tmpl").ParseFiles(templateRoutingTablePath)
 			Expect(err).NotTo(HaveOccurred())
-		})

-		AfterAll(func() {
-			if os.Getenv("E2E_KEEP_LOGS") != "true" {
-				Expect(os.RemoveAll(tempDirPathRoot)).To(Succeed())
-			}
+			tempDirPath, err = os.MkdirTemp("", "kube-vip-test")
+			Expect(err).NotTo(HaveOccurred())
 		})

 		Describe("kube-vip IPv4 control-plane routing table mode functionality", Ordered, func() {
 			var (
 				cpVIP       string
 				clusterName string
-				client      kubernetes.Interface
-				tempDirPath string

 				nodesNumber = 3
 			)

 			BeforeAll(func() {
-				cpVIP = e2e.GenerateVIP(utils.IPv4Family, SOffset.Get())
+				cpVIP = e2e.GenerateVIP(e2e.IPv4Family, SOffset.Get())

 				networking := &kindconfigv1alpha4.Networking{
 					IPFamily: kindconfigv1alpha4.IPv4Family,
@@ -96,22 +84,13 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					ControlPlaneEnable: "true",
 					SvcEnable:          "false",
 					SvcElectionEnable:  "false",
-					EnableNodeLabeling: "false",
 				}

-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, _ = prepareCluster(tempDirPath, "rt-ipv4", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			It("setups IPv4 address and route on control-plane node", func() {
@@ -126,7 +105,7 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 						container = fmt.Sprintf("%s-control-plane", clusterName)
 					}

-					Expect(checkIPAddress(cpVIP, container, true)).To(BeTrue())
+					checkIPAddress(cpVIP, container, true)
 					e2e.CheckRoutePresence(cpVIP, container, true)
 				}
 			})
@@ -136,15 +115,13 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			var (
 				cpVIP       string
 				clusterName string
-				client      kubernetes.Interface
-				tempDirPath string

 				nodesNumber = 3
 			)

 			BeforeAll(func() {

-				cpVIP = e2e.GenerateVIP(utils.IPv6Family, SOffset.Get())
+				cpVIP = e2e.GenerateVIP(e2e.IPv6Family, SOffset.Get())

 				networking := &kindconfigv1alpha4.Networking{
 					IPFamily: kindconfigv1alpha4.IPv6Family,
@@ -157,22 +134,13 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					ControlPlaneEnable: "true",
 					SvcEnable:          "false",
 					SvcElectionEnable:  "false",
-					EnableNodeLabeling: "false",
 				}

-				var err error
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, _ = prepareCluster(tempDirPath, "rt-ipv6", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			It("setups IPv6 address and route on control-plane node", func() {
@@ -187,7 +155,7 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 						container = fmt.Sprintf("%s-control-plane", clusterName)
 					}

-					Expect(checkIPAddress(cpVIP, container, true)).To(BeTrue())
+					checkIPAddress(cpVIP, container, true)
 					e2e.CheckRoutePresence(cpVIP, container, true)
 				}
 			})
@@ -197,8 +165,6 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			var (
 				cpVIP       string
 				clusterName string
-				client      kubernetes.Interface
-				tempDirPath string

 				nodesNumber = 3
 			)
@@ -232,18 +198,11 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					ipnet: localIPv6Net,
 				}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, addSAN, 1)
+				clusterName, _ = prepareCluster(tempDirPath, "rt-ds-ipv4", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, addSAN)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			It("setups DualStack addresses and routes on control-plane nodes", func() {
@@ -261,7 +220,7 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					addresses := vip.Split(cpVIP)

 					for _, addr := range addresses {
-						Expect(checkIPAddress(addr, container, true)).To(BeTrue())
+						checkIPAddress(addr, container, true)
 						e2e.CheckRoutePresence(addr, container, true)
 					}
 				}
@@ -272,8 +231,6 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			var (
 				cpVIP       string
 				clusterName string
-				client      kubernetes.Interface
-				tempDirPath string

 				nodesNumber = 3
 			)
@@ -309,18 +266,11 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					ipnet: localIPv4Net,
 				}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, addSAN, 1)
+				clusterName, _ = prepareCluster(tempDirPath, "rt-ds-ipv6", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, addSAN)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			It("setups DualStack addresses and routes on control-plane nodes", func() {
@@ -338,7 +288,7 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 					addresses := vip.Split(cpVIP)

 					for _, addr := range addresses {
-						Expect(checkIPAddress(addr, container, true)).To(BeTrue())
+						checkIPAddress(addr, container, true)
 						e2e.CheckRoutePresence(addr, container, true)
 					}
 				}
@@ -353,13 +303,12 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				svcElection    bool
 				ipFamily       []corev1.IPFamily
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				cpVIP = e2e.GenerateVIP(utils.IPv4Family, SOffset.Get())
+				cpVIP = e2e.GenerateVIP(e2e.IPv4Family, SOffset.Get())

 				networking := &kindconfigv1alpha4.Networking{
 					IPFamily: kindconfigv1alpha4.IPv4Family,
@@ -380,25 +329,17 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-svc-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, client = prepareCluster(tempDirPath, "rt-svc-ipv4", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("configures an IPv4 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv4Family, offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
+					lbAddress := e2e.GenerateVIP(e2e.IPv4Family, offset)
+					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName, trafficPolicy, client, svcElection, ipFamily, 1)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -406,9 +347,8 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv4Family, offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
+					lbAddress := e2e.GenerateVIP(e2e.IPv4Family, offset)
+					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName, trafficPolicy, client, svcElection, ipFamily, 2)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -423,13 +363,12 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				svcElection    bool
 				ipFamily       []corev1.IPFamily
-				tempDirPath    string

 				nodesNumber = 1
 			)

 			BeforeAll(func() {
-				cpVIP = e2e.GenerateVIP(utils.IPv6Family, SOffset.Get())
+				cpVIP = e2e.GenerateVIP(e2e.IPv6Family, SOffset.Get())

 				networking := &kindconfigv1alpha4.Networking{
 					IPFamily: kindconfigv1alpha4.IPv6Family,
@@ -450,25 +389,17 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 				ipFamily = []corev1.IPFamily{corev1.IPv6Protocol}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-svc-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, client = prepareCluster(tempDirPath, "rt-svc-ipv6", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("configures an IPv6 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv6Family, offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
+					lbAddress := e2e.GenerateVIP(e2e.IPv6Family, offset)
+					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName, trafficPolicy, client, svcElection, ipFamily, 1)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -476,9 +407,8 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv6Family, offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
+					lbAddress := e2e.GenerateVIP(e2e.IPv6Family, offset)
+					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName, trafficPolicy, client, svcElection, ipFamily, 2)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -493,7 +423,6 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				svcElection    bool
 				ipFamily       []corev1.IPFamily
-				tempDirPath    string

 				nodesNumber = 1
 			)
@@ -521,25 +450,17 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol, corev1.IPv6Protocol}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-svc-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, client = prepareCluster(tempDirPath, "rt-ds-svc-ipv4", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("configures an IPv4 and IPv6 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
 					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
+					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName, trafficPolicy, client, svcElection, ipFamily, 1)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -548,8 +469,7 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
 					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
+					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName, trafficPolicy, client, svcElection, ipFamily, 2)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -564,7 +484,6 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 				manifestValues *e2e.KubevipManifestValues
 				svcElection    bool
 				ipFamily       []corev1.IPFamily
-				tempDirPath    string

 				nodesNumber = 1
 			)
@@ -594,25 +513,17 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {

 				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol, corev1.IPv6Protocol}

-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-svc-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
+				clusterName, client = prepareCluster(tempDirPath, "rt-ds-svc-ipv6", k8sImagePath, v129, kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil)
 			})

 			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
+				cleanupCluster(clusterName, tempDirPath, ConfigMtx, logger)
 			})

 			DescribeTable("configures an IPv4 and IPv6 routes for services",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
 					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
+					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName, trafficPolicy, client, svcElection, ipFamily, 1)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
@@ -621,338 +532,17 @@ var _ = Describe("kube-vip routing table mode", Ordered, func() {
 			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
 				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
 					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
+					testServiceRT(svcName, lbAddress, "plndr-svcs-lock", "kube-system", clusterName, trafficPolicy, client, svcElection, ipFamily, 2)
 				},
 				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
 				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
 			)
 		})
-
-		Describe("kube-vip IPv4 services routing table mode functionality with services election", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				svcElection    bool
-				ipFamily       []corev1.IPFamily
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				cpVIP = e2e.GenerateVIP(utils.IPv4Family, SOffset.Get())
-
-				networking := &kindconfigv1alpha4.Networking{
-					IPFamily: kindconfigv1alpha4.IPv4Family,
-				}
-
-				manifestValues = &e2e.KubevipManifestValues{
-					ControlPlaneVIP:    cpVIP,
-					ImagePath:          imagePath,
-					ConfigPath:         configPath,
-					ControlPlaneEnable: "false",
-					SvcEnable:          "true",
-					SvcElectionEnable:  "true",
-				}
-
-				var err error
-				svcElection, err = strconv.ParseBool(manifestValues.SvcElectionEnable)
-				Expect(err).ToNot(HaveOccurred())
-
-				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol}
-
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-svc-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("configures an IPv4 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv4Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv4Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted if common lease is used",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv4Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, true)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip IPv6 services routing table mode functionality with services election", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				svcElection    bool
-				ipFamily       []corev1.IPFamily
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				cpVIP = e2e.GenerateVIP(utils.IPv6Family, SOffset.Get())
-
-				networking := &kindconfigv1alpha4.Networking{
-					IPFamily: kindconfigv1alpha4.IPv6Family,
-				}
-
-				manifestValues = &e2e.KubevipManifestValues{
-					ControlPlaneVIP:    cpVIP,
-					ImagePath:          imagePath,
-					ConfigPath:         configPath,
-					ControlPlaneEnable: "false",
-					SvcEnable:          "true",
-					SvcElectionEnable:  "true",
-				}
-
-				var err error
-				svcElection, err = strconv.ParseBool(manifestValues.SvcElectionEnable)
-				Expect(err).ToNot(HaveOccurred())
-
-				ipFamily = []corev1.IPFamily{corev1.IPv6Protocol}
-
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-svc-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("configures an IPv6 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv6Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv6Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted when common lease is used",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateVIP(utils.IPv6Family, offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, true)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services routing table mode functionality - IPv4 primary with services election", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				svcElection    bool
-				ipFamily       []corev1.IPFamily
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				cpVIP = e2e.GenerateDualStackVIP(SOffset.Get())
-
-				networking := &kindconfigv1alpha4.Networking{
-					IPFamily: kindconfigv1alpha4.DualStackFamily,
-				}
-
-				manifestValues = &e2e.KubevipManifestValues{
-					ControlPlaneVIP:      cpVIP,
-					ImagePath:            imagePath,
-					ConfigPath:           configPath,
-					ControlPlaneEnable:   "false",
-					SvcEnable:            "true",
-					SvcElectionEnable:    "true",
-					EnableEndpointslices: "true",
-				}
-
-				var err error
-				svcElection, err = strconv.ParseBool(manifestValues.SvcElectionEnable)
-				Expect(err).ToNot(HaveOccurred())
-
-				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol, corev1.IPv6Protocol}
-
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-svc-ipv4", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("configures an IPv4 and IPv6 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted when common lease is used",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, true)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
-
-		Describe("kube-vip DualStack services routing table mode functionality - IPv6 primary with services election", Ordered, func() {
-			var (
-				cpVIP          string
-				clusterName    string
-				client         kubernetes.Interface
-				manifestValues *e2e.KubevipManifestValues
-				svcElection    bool
-				ipFamily       []corev1.IPFamily
-				tempDirPath    string
-
-				nodesNumber = 1
-			)
-
-			BeforeAll(func() {
-				cpVIP = e2e.GenerateDualStackVIP(SOffset.Get())
-
-				networking := &kindconfigv1alpha4.Networking{
-					IPFamily:      kindconfigv1alpha4.DualStackFamily,
-					PodSubnet:     "fd00:10:244::/56,10.244.0.0/16",
-					ServiceSubnet: "fd00:10:96::/112,10.96.0.0/16",
-				}
-
-				manifestValues = &e2e.KubevipManifestValues{
-					ControlPlaneVIP:      cpVIP,
-					ImagePath:            imagePath,
-					ConfigPath:           configPath,
-					ControlPlaneEnable:   "false",
-					SvcEnable:            "true",
-					SvcElectionEnable:    "true",
-					EnableEndpointslices: "true",
-				}
-
-				var err error
-				svcElection, err = strconv.ParseBool(manifestValues.SvcElectionEnable)
-				Expect(err).ToNot(HaveOccurred())
-
-				ipFamily = []corev1.IPFamily{corev1.IPv4Protocol, corev1.IPv6Protocol}
-
-				tempDirPath, err = os.MkdirTemp(tempDirPathRoot, "kube-vip-test")
-				Expect(err).NotTo(HaveOccurred())
-
-				clusterName, client, _ = prepareCluster(tempDirPath, "rt-ds-svc-ipv6", k8sImagePath, v129,
-					kubeVIPRoutingTableManifestTemplate, logger, manifestValues, networking, nodesNumber, nil, 1)
-			})
-
-			AfterAll(func() {
-				By(fmt.Sprintf("saving logs to %q", tempDirPath))
-				err := e2e.GetLogs(context.Background(), client, tempDirPath)
-				Expect(err).ToNot(HaveOccurred())
-				cleanupCluster(clusterName, ConfigMtx, logger)
-			})
-
-			DescribeTable("configures an IPv4 and IPv6 routes for services",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 1, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, false)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-				Entry("with external traffic policy - local", "test-svc-local", SOffset.Get(), corev1.ServiceExternalTrafficPolicyLocal),
-			)
-
-			DescribeTable("only removes route if it was referenced by multiple services and all of them were deleted when common lease is used",
-				func(svcName string, offset uint, trafficPolicy corev1.ServiceExternalTrafficPolicy) {
-					lbAddress := e2e.GenerateDualStackVIP(offset)
-					testServiceRT(svcName, lbAddress, fmt.Sprintf("kubevip-%s", svcName), dsNamespace, clusterName,
-						trafficPolicy, client, svcElection, ipFamily, 2, true)
-				},
-				Entry("with external traffic policy - cluster", "test-svc-cluster", SOffset.Get(), corev1.ServiceExternalTrafficPolicyCluster),
-			)
-		})
 	}
 })

 func testServiceRT(svcName, lbAddress, leaseName, leaseNamespace, clusterName string, trafficPolicy corev1.ServiceExternalTrafficPolicy,
-	client kubernetes.Interface, serviceElection bool, ipFamily []corev1.IPFamily, numberOfServices int, commonLease bool) {
+	client kubernetes.Interface, serviceElection bool, ipFamily []corev1.IPFamily, numberOfServices int) {
 	lbAddresses := vip.Split(lbAddress)

 	services := []string{}
@@ -961,51 +551,28 @@ func testServiceRT(svcName, lbAddress, leaseName, leaseNamespace, clusterName st
 	}

 	for _, svc := range services {
-		svcLease := ""
-		if commonLease {
-			svcLease = leaseName
-		}
 		createTestService(svc, dsNamespace, dsName, lbAddress,
-			client, corev1.IPFamilyPolicyPreferDualStack, ipFamily, trafficPolicy, svcLease, 1)
-		time.Sleep(time.Second)
+			client, corev1.IPFamilyPolicyPreferDualStack, ipFamily, trafficPolicy)
 	}

 	var container string
 	if serviceElection {
-		for _, svc := range services {
-			lease := fmt.Sprintf("kubevip-%s", svc)
-			if commonLease {
-				lease = leaseName
-			}
-			By(withTimestamp(fmt.Sprintf("getting lease holder for lease '%s/%s'", leaseNamespace, lease)))
-			container = e2e.GetLeaseHolder(lease, leaseNamespace, client)
-			for _, addr := range lbAddresses {
-				By(withTimestamp(fmt.Sprintf("checking route presence for address %q on container %q", addr, container)))
-				e2e.CheckRoutePresence(addr, container, true)
-			}
-		}
+		container = e2e.GetLeaseHolder(leaseName, leaseNamespace, client)
 	} else {
 		container = fmt.Sprintf("%s-control-plane", clusterName)
-		for _, addr := range lbAddresses {
-			By(withTimestamp(fmt.Sprintf("checking route presence for address %q on container %q", addr, container)))
-			e2e.CheckRoutePresence(addr, container, true)
-		}
+	}
+
+	for _, addr := range lbAddresses {
+		e2e.CheckRoutePresence(addr, container, true)
 	}

 	for i := range numberOfServices {
-		By(withTimestamp(fmt.Sprintf("deleting service %s/%s\n", dsNamespace, services[i])))
 		expected := i < numberOfServices-1
 		err := client.CoreV1().Services(dsNamespace).Delete(context.TODO(), services[i], metav1.DeleteOptions{})
 		Expect(err).ToNot(HaveOccurred())
-		time.Sleep(time.Second)

 		for _, addr := range lbAddresses {
-			By(withTimestamp(fmt.Sprintf("checking route presence for address %q on container %q - expected: %t", addr, container, expected)))
 			e2e.CheckRoutePresence(addr, container, expected)
-			if commonLease {
-				By(withTimestamp(fmt.Sprintf("getting lease holder for lease '%s/%s' - expected: %t", leaseNamespace, leaseName, expected)))
-				e2e.CheckLeasePresence(leaseName, leaseNamespace, client, expected)
-			}
 		}
 	}
 }
--- a/testing/e2e/e2e_sigusr1_test.go
+++ b/testing/e2e/e2e_sigusr1_test.go
@@ -1,97 +0,0 @@
-//go:build e2e
-// +build e2e
-
-package e2e_test
-
-import (
-	"context"
-	"os"
-	"os/exec"
-	"syscall"
-	"time"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/onsi/gomega/gbytes"
-	"github.com/onsi/gomega/gexec"
-)
-
-var _ = Describe("SIGUSR1 Signal Handler", func() {
-	var (
-		session *gexec.Session
-		ctx     context.Context
-		cancel  context.CancelFunc
-	)
-
-	BeforeEach(func() {
-		ctx, cancel = context.WithTimeout(context.Background(), 30*time.Second)
-	})
-
-	AfterEach(func() {
-		if session != nil {
-			session.Terminate()
-			Eventually(session).Should(gexec.Exit())
-		}
-		cancel()
-	})
-
-	When("kube-vip receives SIGUSR1", func() {
-		It("should dump configuration without terminating", func() {
-			Skip("Skipping until signal handler is implemented")
-
-			kvPath := os.Getenv("KUBE_VIP_PATH")
-			if kvPath == "" {
-				kvPath = "../../kube-vip"
-			}
-
-			cmd := exec.CommandContext(ctx, kvPath, "manager",
-				"--address", "192.168.1.100",
-				"--interface", "lo",
-				"--port", "6443",
-			)
-
-			var err error
-			session, err = gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
-			Expect(err).NotTo(HaveOccurred())
-
-			time.Sleep(2 * time.Second)
-
-			err = session.Command.Process.Signal(syscall.SIGUSR1)
-			Expect(err).NotTo(HaveOccurred())
-
-			Eventually(session.Out, "5s").Should(gbytes.Say("KUBE-VIP CONFIGURATION DUMP"))
-			Eventually(session.Out).Should(gbytes.Say("VIP: 192.168.1.100"))
-
-			Consistently(session, "2s").ShouldNot(gexec.Exit())
-		})
-
-		It("should handle multiple SIGUSR1 signals", func() {
-			Skip("Skipping until signal handler is implemented")
-
-			kvPath := os.Getenv("KUBE_VIP_PATH")
-			if kvPath == "" {
-				kvPath = "../../kube-vip"
-			}
-
-			cmd := exec.CommandContext(ctx, kvPath, "manager",
-				"--address", "192.168.1.100",
-				"--interface", "lo",
-			)
-
-			var err error
-			session, err = gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
-			Expect(err).NotTo(HaveOccurred())
-
-			time.Sleep(2 * time.Second)
-
-			for i := 0; i < 3; i++ {
-				err = session.Command.Process.Signal(syscall.SIGUSR1)
-				Expect(err).NotTo(HaveOccurred())
-				time.Sleep(1 * time.Second)
-			}
-
-			Eventually(session.Out).Should(gbytes.Say("KUBE-VIP CONFIGURATION DUMP"))
-			Consistently(session, "2s").ShouldNot(gexec.Exit())
-		})
-	})
-})
--- a/testing/e2e/e2e_test.go
+++ b/testing/e2e/e2e_test.go
--- a/testing/e2e/etcd/election_test.go
+++ b/testing/e2e/etcd/election_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/onsi/gomega/format"
 	"k8s.io/klog/v2"

-	"github.com/kube-vip/kube-vip/pkg/utils"
 	"github.com/kube-vip/kube-vip/testing/e2e"
 	"github.com/kube-vip/kube-vip/testing/e2e/etcd"
 )
@@ -61,7 +60,7 @@ var _ = Describe("kube-vip with etcd leader election", func() {

 			test.kubeVipImage = os.Getenv("E2E_IMAGE_PATH")

-			test.vip = e2e.GenerateVIP(utils.IPv4Family, 5)
+			test.vip = e2e.GenerateVIP(e2e.IPv4Family, 5)
 			test.logger.Printf("Selected VIP %s", test.vip)

 			test.currentDir, err = os.Getwd()
--- a/testing/e2e/ip.go
+++ b/testing/e2e/ip.go
@@ -16,7 +16,7 @@ import (
 	"sync"
 	"time"

-	"github.com/kube-vip/kube-vip/pkg/utils"
+	"github.com/kube-vip/kube-vip/pkg/vip"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
@@ -28,6 +28,8 @@ import (
 )

 const (
+	IPv4Family          = "IPv4"
+	IPv6Family          = "IPv6"
 	DualstackFamily     = "DualStack"
 	DualstackFamilyIPv6 = "DualStackIPv6"
 )
@@ -70,7 +72,7 @@ func EnsureKindNetwork() {

 func GenerateVIP(family string, offset uint) string {
 	if family == DualstackFamily || family == DualstackFamilyIPv6 {
-		return fmt.Sprintf("%s,%s", GenerateVIP(utils.IPv4Family, offset), GenerateVIP(utils.IPv6Family, offset))
+		return fmt.Sprintf("%s,%s", GenerateVIP(IPv4Family, offset), GenerateVIP(IPv6Family, offset))
 	}

 	cidrs := getKindNetworkSubnetCIDRs()
@@ -80,7 +82,7 @@ func GenerateVIP(family string, offset uint) string {
 			ip, ipNet, parseErr := net.ParseCIDR(cidr)
 			Expect(parseErr).NotTo(HaveOccurred())

-			if ip.To4() == nil && family == utils.IPv6Family {
+			if ip.To4() == nil && family == IPv6Family {
 				lowerMask := binary.BigEndian.Uint64(ipNet.Mask[8:])
 				lowerStart := binary.BigEndian.Uint64(ipNet.IP[8:])
 				lowerEnd := (lowerStart & lowerMask) | (^lowerMask)
@@ -91,7 +93,7 @@ func GenerateVIP(family string, offset uint) string {
 				// Copy lower half into chosenVIP
 				binary.BigEndian.PutUint64(chosenVIP[8:], lowerEnd-uint64(offset))
 				return net.IP(chosenVIP).String()
-			} else if ip.To4() != nil && family == utils.IPv4Family {
+			} else if ip.To4() != nil && family == IPv4Family {
 				mask := binary.BigEndian.Uint32(ipNet.Mask)
 				start := binary.BigEndian.Uint32(ipNet.IP)
 				end := (start & mask) | (^mask)
@@ -108,7 +110,7 @@ func GenerateVIP(family string, offset uint) string {
 }

 func GenerateDualStackVIP(offset uint) string {
-	return GenerateVIP(utils.IPv4Family, offset) + "," + GenerateVIP(utils.IPv6Family, offset)
+	return GenerateVIP(IPv4Family, offset) + "," + GenerateVIP(IPv6Family, offset)
 }

 func getKindNetworkSubnetCIDRs() []string {
@@ -139,7 +141,7 @@ func getKindNetworkSubnetCIDRs() []string {

 func CheckIPAddressPresence(ip string, container string, expected bool) bool {
 	family := "-4"
-	if utils.IsIPv6(ip) {
+	if vip.IsIPv6(ip) {
 		family = "-6"
 	}

@@ -152,18 +154,14 @@ func CheckIPAddressPresence(ip string, container string, expected bool) bool {
 	cmd.Stdout = cmdOut
 	cmd.Stderr = cmdErr
 	if err := cmd.Run(); err != nil {
-		By(fmt.Sprintf("contianer %q interfaces error: %s", container, cmdErr.String()))
 		return false
 	}

-	By(fmt.Sprintf("contianer %q interfaces:\n %s", container, cmdOut.String()))
-
 	return strings.Contains(cmdOut.String(), ip) == expected
 }

 func CheckIPAddressPresenceByLease(name, namespace, ip string, client kubernetes.Interface, expected bool) bool {
 	container := GetLeaseHolder(name, namespace, client)
-	By("Lease holder: " + container)
 	if container == "" {
 		return false
 	}
@@ -172,7 +170,7 @@ func CheckIPAddressPresenceByLease(name, namespace, ip string, client kubernetes

 func CheckRoutePresence(ip string, container string, expected bool) bool {
 	family := "-4"
-	if utils.IsIPv6(ip) {
+	if vip.IsIPv6(ip) {
 		family = "-6"
 	}

@@ -189,48 +187,23 @@ func CheckRoutePresence(ip string, container string, expected bool) bool {
 		cmd.Stderr = cmdErr
 		cmd.Run()

-		By("Routes: " + cmdOut.String())
-
 		result = strings.Contains(cmdOut.String(), ip) == expected

 		return result
-	}, "120s", "1s").Should(BeTrue())
+	}, "60s", "1s").Should(BeTrue())

 	return result
 }

-func CheckLeasePresence(name, namespace string, client kubernetes.Interface, expected bool) *coordinationv1.Lease {
+func GetLeaseHolder(name, namespace string, client kubernetes.Interface) string {
 	var lease *coordinationv1.Lease
 	Eventually(func() error {
 		var err error
 		lease, err = client.CoordinationV1().Leases(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 		return err
-	}, "360s", "1s").ShouldNot(HaveOccurred())
+	}, "300s").ShouldNot(HaveOccurred())

 	Expect(lease).ToNot(BeNil())
-
-	if expected {
-		Expect(lease.Spec.HolderIdentity).ToNot(BeNil())
-	} else {
-		if lease.Spec.HolderIdentity != nil {
-			if expected {
-				Expect(*lease.Spec.HolderIdentity).ToNot(BeEmpty())
-			} else {
-				Expect(*lease.Spec.HolderIdentity).To(BeEmpty())
-			}
-		}
-	}
-
-	return lease
-}
-
-func GetLeaseHolder(name, namespace string, client kubernetes.Interface) string {
-	var lease *coordinationv1.Lease
-	Eventually(func() string {
-		lease = CheckLeasePresence(name, namespace, client, true)
-		return *lease.Spec.HolderIdentity
-	}, "360s", "1s").ShouldNot(BeEmpty())
-
 	return *lease.Spec.HolderIdentity
 }

--- a/testing/e2e/kube-vip-bgp.yaml.tmpl
+++ b/testing/e2e/kube-vip-bgp.yaml.tmpl
@@ -4,8 +4,6 @@ kind: Pod
 metadata:
  name: kube-vip
  namespace: kube-system
-  labels:
-    app: kube-vip
 spec:
  containers:
  - name: kube-vip
@@ -61,8 +59,6 @@ spec:
      value: "{{ .SvcEnable }}"
    - name: svc_election
      value: "{{ .SvcElectionEnable }}"
-    - name: enable_node_labeling
-      value: "{{ .EnableNodeLabeling }}"
    - name: enable_endpointslices
      value: "{{ .EnableEndpointslices }}"
    image: "{{ .ImagePath }}"
--- a/testing/e2e/kube-vip-hostname.yaml.tmpl
+++ b/testing/e2e/kube-vip-hostname.yaml.tmpl
@@ -4,8 +4,6 @@ kind: Pod
 metadata:
  name: kube-vip
  namespace: kube-system
-  labels:
-    app: kube-vip
 spec:
  containers:
  - name: kube-vip
@@ -30,8 +28,6 @@ spec:
      value: "1"
    - name: cp_enable
      value: "true"
-    - name: enable_node_labeling
-      value: "{{ .EnableNodeLabeling }}"
    image: "{{ .ImagePath }}"
    imagePullPolicy: Never
    securityContext:
--- a/testing/e2e/kube-vip-routing-table.yaml.tmpl
+++ b/testing/e2e/kube-vip-routing-table.yaml.tmpl
@@ -4,8 +4,6 @@ kind: Pod
 metadata:
  name: kube-vip
  namespace: kube-system
-  labels:
-    app: kube-vip
 spec:
  containers:
  - name: kube-vip
@@ -46,8 +44,6 @@ spec:
      value: "{{ .SvcEnable }}"
    - name: svc_election
      value: "{{ .SvcElectionEnable }}"
-    - name: enable_node_labeling
-      value: "{{ .EnableNodeLabeling }}"
    - name: enable_endpointslices
      value: "{{ .EnableEndpointslices }}"
    image: "{{ .ImagePath }}"
--- a/testing/e2e/kube-vip.yaml.tmpl
+++ b/testing/e2e/kube-vip.yaml.tmpl
@@ -4,8 +4,6 @@ kind: Pod
 metadata:
  name: kube-vip
  namespace: kube-system
-  labels:
-    app: kube-vip
 spec:
  containers:
  - name: kube-vip
@@ -40,8 +38,6 @@ spec:
      value: "{{ .SvcEnable }}"
    - name: svc_election
      value: "{{ .SvcElectionEnable }}"
-    - name: enable_node_labeling
-      value: "{{ .EnableNodeLabeling }}"
    - name: enable_endpointslices
      value: "{{ .EnableEndpointslices }}"
    image: "{{ .ImagePath }}"
--- a/testing/e2e/logs.go
+++ b/testing/e2e/logs.go
@@ -1,129 +0,0 @@
-package e2e
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"time"
-
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-)
-
-func GetLogs(ctx context.Context, client kubernetes.Interface, tempDirPath string) error {
-	if os.Getenv("E2E_KEEP_LOGS") != "true" {
-		if err := os.RemoveAll(tempDirPath); err != nil {
-			return fmt.Errorf("failed to remove temporary directory %q: %w", tempDirPath, err)
-		}
-		return nil
-	}
-
-	intCtx, cancel := context.WithTimeout(ctx, time.Second*10)
-	defer cancel()
-
-	path := filepath.Join(tempDirPath, "pods.json")
-	fpods, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("failed to create file %q: %w", path, err)
-	}
-	defer fpods.Close()
-
-	// list pods
-	pods, err := client.CoreV1().Pods("").List(intCtx, metav1.ListOptions{})
-	if err != nil {
-		return fmt.Errorf("failed to get pods: %w", err)
-	}
-	data, err := json.Marshal(pods)
-	if err != nil {
-		return fmt.Errorf("failed to marshal pods data: %w", err)
-	}
-	if _, err := fpods.Write(data); err != nil {
-		return fmt.Errorf("failed to save pods: %w", err)
-	}
-
-	// list services
-	path = filepath.Join(tempDirPath, "services.json")
-	fsvcs, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("failed to create file %q: %w", path, err)
-	}
-	defer fpods.Close()
-
-	svcs, err := client.CoreV1().Services("").List(intCtx, metav1.ListOptions{})
-	if err != nil {
-		return fmt.Errorf("failed to get pods: %w", err)
-	}
-	data, err = json.Marshal(svcs)
-	if err != nil {
-		return fmt.Errorf("failed to marshal pods data: %w", err)
-	}
-	if _, err := fsvcs.Write(data); err != nil {
-		return fmt.Errorf("failed to save pods: %w", err)
-	}
-
-	// list leases
-	path = filepath.Join(tempDirPath, "leases.json")
-	fleases, err := os.Create(path)
-	if err != nil {
-		return fmt.Errorf("failed to create file %q: %w", path, err)
-	}
-	defer fpods.Close()
-
-	leases, err := client.CoordinationV1().Leases("").List(intCtx, metav1.ListOptions{})
-	if err != nil {
-		return fmt.Errorf("failed to get leases: %w", err)
-	}
-	data, err = json.Marshal(leases)
-	if err != nil {
-		return fmt.Errorf("failed to marshal leases data: %w", err)
-	}
-	if _, err := fleases.Write(data); err != nil {
-		return fmt.Errorf("failed to save leases: %w", err)
-	}
-
-	// get kube-vip pods
-	listOptions := metav1.ListOptions{
-		LabelSelector: "app=kube-vip",
-	}
-
-	kvpods, err := client.CoreV1().Pods("").List(intCtx, listOptions)
-	if err != nil {
-		return fmt.Errorf("failed to list pods: %w", err)
-	}
-
-	for _, pod := range kvpods.Items {
-		if pod.Status.Phase != corev1.PodRunning {
-			continue
-		}
-		req := client.CoreV1().Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{})
-		podLogs, err := req.Stream(intCtx)
-		if err != nil {
-			if apierrors.IsNotFound(err) {
-				continue
-			}
-			return fmt.Errorf("reading request stream: %w", err)
-		}
-		defer podLogs.Close()
-
-		buf := new(bytes.Buffer)
-		_, err = io.Copy(buf, podLogs)
-		if err != nil {
-			return fmt.Errorf("failed to copy logs to buffer: %w", err)
-		}
-
-		path := filepath.Join(tempDirPath, fmt.Sprintf("%s-%s.log", pod.Namespace, pod.Name))
-		err = os.WriteFile(path, buf.Bytes(), 0600)
-		if err != nil {
-			return fmt.Errorf("failed to write the log file %q: %w", path, err)
-		}
-	}
-
-	return nil
-}
--- a/testing/e2e/template.go
+++ b/testing/e2e/template.go
@@ -15,7 +15,6 @@ type KubevipManifestValues struct {
 	SvcEnable            string
 	SvcElectionEnable    string
 	EnableEndpointslices string
-	EnableNodeLabeling   string
 	ControlPlaneEnable   string
 	BGPAS                uint32
 	BGPPeers             string
--- a/testing/services/main.go
+++ b/testing/services/main.go
@@ -59,12 +59,6 @@ func main() {
 	t.ServiceName = "kube-vip-service"
 	t.LeaderName = "kube-vip-deploy-leader"

-	var err error
-	t.TempDirPath, err = os.MkdirTemp("", "kube-vip-services")
-	if err != nil {
-		slog.Fatal(err)
-	}
-
 	if t.ControlPlane {
 		err := t.CreateKind()
 		if !t.RetainCluster {
--- a/testing/services/pkg/deployment/kubernetes.go
+++ b/testing/services/pkg/deployment/kubernetes.go
@@ -6,7 +6,6 @@ import (
 	"time"

 	"github.com/gookit/slog"
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
@@ -45,21 +44,18 @@ func (d *Deployment) CreateKVDs(ctx context.Context, clientset *kubernetes.Clien
 			Namespace: "kube-system",
 			Labels: map[string]string{
 				"app.kubernetes.io/name": "kube-vip-ds",
-				"app":                    "kube-vip",
 			},
 		},
 		Spec: appsv1.DaemonSetSpec{
 			Selector: &metav1.LabelSelector{
 				MatchLabels: map[string]string{
 					"app.kubernetes.io/name": "kube-vip-ds",
-					"app":                    "kube-vip",
 				},
 			},
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
 						"app.kubernetes.io/name": "kube-vip-ds",
-						"app":                    "kube-vip",
 					},
 				},
 				Spec: v1.PodSpec{
@@ -77,7 +73,7 @@ func (d *Deployment) CreateKVDs(ctx context.Context, clientset *kubernetes.Clien
 								},
 								{
 									Name:  "vip_subnet",
-									Value: "auto,auto",
+									Value: "32",
 								},
 								{
 									Name:  "svc_enable",
@@ -239,23 +235,23 @@ func (s *Service) CreateService(ctx context.Context, clientset *kubernetes.Clien
 	}

 	if s.egress {
-		svc.Annotations = map[string]string{
-			kubevip.Egress: "true",
+		svc.Annotations = map[string]string{ //kube-vip.io/egress: "true"
+			"kube-vip.io/egress": "true",
 		}
 	}

 	if s.egressInternal {
-		svc.Annotations[kubevip.EgressInternal] = "true"
+		svc.Annotations["kube-vip.io/egress-internal"] = "true"
 	}

 	if s.egressIPv6 {
-		svc.Annotations[kubevip.EgressIPv6] = "true"
+		svc.Annotations["kube-vip.io/egress-ipv6"] = "true"
 	}

-	//svc.Annotations[kubevip.EgressDeniedNetworks] = "172.18.0.0/24"
-	//svc.Annotations[kubevip.EgressAllowedNetworks] = "172.18.0.0/24"
+	//svc.Annotations["kube-vip.io/egress-denied-networks"] = "172.18.0.0/24"
+	//svc.Annotations["kube-vip.io/egress-allowed-networks"] = "172.18.0.0/24"

-	//svc.Annotations[kubevip.EgressAllowedNetworks] = "192.168.0.0/24, 172.18.0.0/24"
+	//svc.Annotations["kube-vip.io/egress-allowed-networks"] = "192.168.0.0/24, 172.18.0.0/24"

 	if s.policyLocal {
 		svc.Spec.ExternalTrafficPolicy = v1.ServiceExternalTrafficPolicyTypeLocal
@@ -273,7 +269,7 @@ func (s *Service) CreateService(ctx context.Context, clientset *kubernetes.Clien
 		if err != nil {
 			slog.Fatal(err)
 		}
-		svc.Annotations[kubevip.LoadbalancerIPAnnotation] = fmt.Sprintf("%s,%s", ipv4VIP, ipv6VIP)
+		svc.Annotations["kube-vip.io/loadbalancerIPs"] = fmt.Sprintf("%s,%s", ipv4VIP, ipv6VIP)
 		svc.Labels["implementation"] = "kube-vip"
 		svc.Spec.IPFamilies = []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol}
 		ipfPolicy := v1.IPFamilyPolicyRequireDualStack
@@ -316,9 +312,9 @@ func (s *Service) CreateService(ctx context.Context, clientset *kubernetes.Clien
 					for _, ingress := range svc.Status.LoadBalancer.Ingress {
 						loadBalancerAddresses = append(loadBalancerAddresses, ingress.IP)
 					}
-					slog.Infof("🔎 found load balancer addresses [%s] on node [%s]", loadBalancerAddresses, svc.Annotations[kubevip.VipHost])
+					slog.Infof("🔎 found load balancer addresses [%s] on node [%s]", loadBalancerAddresses, svc.Annotations["kube-vip.io/vipHost"])
 					ready = true
-					currentLeader = svc.Annotations[kubevip.VipHost]
+					currentLeader = svc.Annotations["kube-vip.io/vipHost"]
 				}
 			}
 		default:
--- a/testing/services/pkg/deployment/services.go
+++ b/testing/services/pkg/deployment/services.go
@@ -7,13 +7,10 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"os"
 	"strings"
 	"time"

 	"github.com/gookit/slog"
-	"github.com/kube-vip/kube-vip/pkg/kubevip"
-	"github.com/kube-vip/kube-vip/testing/e2e"
 	"github.com/vishvananda/netlink"

 	"k8s.io/client-go/kubernetes"
@@ -32,35 +29,12 @@ import (
 func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kubernetes.Clientset) []error {
 	var err error
 	var errs []error
-	globalTempDirPath, err := os.MkdirTemp("/tmp", "kube-vip-service-tests")
-	if err != nil {
-		slog.Error(err)
-		return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-	}
-
-	defer func() {
-		if os.Getenv("E2E_KEEP_LOGS") != "true" {
-			if err := os.RemoveAll(globalTempDirPath); err != nil {
-				slog.Error(fmt.Errorf("failed to remove temporary directory %q: %w", globalTempDirPath, err))
-			}
-		}
-	}()
-
 	if config.Simple {
 		err = config.SimpleDeployment(ctx, clientset)
 		if err != nil {
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "Simple")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.Deployments {
@@ -69,15 +43,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "Deployments")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.LeaderFailover {
@@ -87,15 +52,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "LeaderFailover")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.LeaderActive {
@@ -105,15 +61,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "LeaderActive")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.LocalDeploy {
@@ -123,15 +70,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "LocalDeploy")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.Egress {
@@ -141,15 +79,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "EgressDeployment")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.Egress && config.EgressInternal {
@@ -159,15 +88,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "EgressDeploymentInternal")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.EgressIPv6 {
@@ -177,15 +97,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "EgressIPv6")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.EgressIPv6 && config.EgressInternal {
@@ -195,15 +106,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "EgressIPv6Internal")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	if config.DualStack {
@@ -213,15 +115,6 @@ func (config *TestConfig) StartServiceTest(ctx context.Context, clientset *kuber
 			slog.Error(err)
 			errs = append(errs, err)
 		}
-		tempDirPath, err := os.MkdirTemp(globalTempDirPath, "DualStack")
-		if err != nil {
-			slog.Error(err)
-			return []error{fmt.Errorf("failed to create temporary directory: %w", err)}
-		}
-		slog.Infof("saving logs to %q", tempDirPath)
-		if err := e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Error(err)
-		}
 	}

 	const testComplete = "🏆 Testing Complete [%d] passed / [%d] failed"
@@ -318,7 +211,7 @@ func leaderFailover(ctx context.Context, name, leaderNode *string, clientset *ku
 			}
 			if svc.Name == *name {
 				if len(svc.Status.LoadBalancer.Ingress) != 0 {
-					slog.Infof("🔎 found load balancer address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations[kubevip.VipHost])
+					slog.Infof("🔎 found load balancer address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations["kube-vip.io/vipHost"])
 				}
 			}
 		case watch.Modified:
@@ -328,12 +221,12 @@ func leaderFailover(ctx context.Context, name, leaderNode *string, clientset *ku
 			}
 			if svc.Name == *name {
 				if len(svc.Status.LoadBalancer.Ingress) != 0 {
-					slog.Infof("🔍 updated with address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations[kubevip.VipHost])
+					slog.Infof("🔍 updated with address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations["kube-vip.io/vipHost"])
 					err = httpTest(svc.Status.LoadBalancer.Ingress[0].IP)
 					if err != nil {
 						return err
 					}
-					*leaderNode = svc.Annotations[kubevip.VipHost]
+					*leaderNode = svc.Annotations["kube-vip.io/vipHost"]
 				}
 			}
 		default:
@@ -401,7 +294,7 @@ func podFailover(ctx context.Context, name, leaderNode *string, clientset *kuber
 			}
 			if svc.Name == *name {
 				if len(svc.Status.LoadBalancer.Ingress) != 0 {
-					slog.Infof("🔎 found load balancer address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations[kubevip.VipHost])
+					slog.Infof("🔎 found load balancer address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations["kube-vip.io/vipHost"])
 				}
 			}
 		case watch.Modified:
@@ -411,12 +304,12 @@ func podFailover(ctx context.Context, name, leaderNode *string, clientset *kuber
 			}
 			if svc.Name == *name {
 				if len(svc.Status.LoadBalancer.Ingress) != 0 {
-					slog.Infof("🔍 updated with address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations[kubevip.VipHost])
+					slog.Infof("🔍 updated with address [%s] on node [%s]", svc.Status.LoadBalancer.Ingress[0].IP, svc.Annotations["kube-vip.io/vipHost"])
 					err = httpTest(svc.Status.LoadBalancer.Ingress[0].IP)
 					if err != nil {
 						slog.Fatal(err)
 					}
-					*leaderNode = svc.Annotations[kubevip.VipHost]
+					*leaderNode = svc.Annotations["kube-vip.io/vipHost"]
 				}
 			}
 		default:
--- a/testing/services/pkg/deployment/tests.go
+++ b/testing/services/pkg/deployment/tests.go
@@ -4,13 +4,9 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"os"
-	"time"

 	"github.com/gookit/slog"
-	"github.com/kube-vip/kube-vip/testing/e2e"
 	v1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
@@ -52,40 +48,25 @@ type TestConfig struct {

 	// Docker config
 	DockerNIC string
-
-	// temp dir root
-	TempDirPath string
 }

 func (config *TestConfig) SimpleDeployment(ctx context.Context, clientset *kubernetes.Clientset) error {
-
 	// Simple Deployment test
+	var err error
 	defer func() error { //nolint
-		slog.Infof("🧪 ---> simple deployment defer <---")
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "simple-deployment")
-		if err != nil {
-			slog.Infof("🧪 ---> simple deployment mkdir err <---: %w", err)
-			return err
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}

 		slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 		err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 		if err != nil {
 			slog.Fatal(err)
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+		if err != nil {
 			slog.Fatal(err)
 		}
 		return nil
 	}() //nolint

-	var err error
 	slog.Infof("🧪 ---> simple deployment <---")
 	deploy := Deployment{
 		name:         config.DeploymentName,
@@ -109,8 +90,6 @@ func (config *TestConfig) SimpleDeployment(ctx context.Context, clientset *kuber
 		config.SuccessCounter++
 	}

-	slog.Infof("🧪 ---> simple deployment end <---")
-
 	return err
 }

@@ -119,16 +98,6 @@ func (config *TestConfig) MultipleDeployments(ctx context.Context, clientset *ku
 	var err error

 	defer func() error { //nolint
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "multiple-deployments")
-		if err != nil {
-			return err
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		for i := 1; i < 5; i++ {
 			slog.Infof("🧹 deleting service [%s]", fmt.Sprintf("%s-%d", config.ServiceName, i))
 			err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, fmt.Sprintf("%s-%d", config.ServiceName, i), metav1.DeleteOptions{})
@@ -136,8 +105,9 @@ func (config *TestConfig) MultipleDeployments(ctx context.Context, clientset *ku
 				slog.Fatal(err)
 			}
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.LeaderName); err != nil {
+		slog.Infof("🧹 deleting deployment [%s]", config.DeploymentName)
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.LeaderName, metav1.DeleteOptions{})
+		if err != nil {
 			slog.Fatal(err)
 		}
 		return nil
@@ -176,24 +146,15 @@ func (config *TestConfig) Failover(ctx context.Context, clientset *kubernetes.Cl

 	var err error
 	defer func() error {
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "failover")
-		if err != nil {
-			slog.Fatal(err)
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 		err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 		if err != nil {
-			slog.Fatal(err)
+			return err
 		}

-		if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
-			slog.Fatal(err)
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+		if err != nil {
+			return err
 		}
 		return nil
 	}() //nolint
@@ -247,24 +208,14 @@ func (config *TestConfig) ActiveFailover(ctx context.Context, clientset *kuberne

 	var err error
 	defer func() error {
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "active-failover")
-		if err != nil {
-			slog.Fatal(err)
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 		err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 		if err != nil {
-			slog.Fatal(err)
+			return err
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
-			slog.Fatal(err)
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+		if err != nil {
+			return err
 		}
 		return nil
 	}() //nolint
@@ -303,26 +254,17 @@ func (config *TestConfig) LocalDeployment(ctx context.Context, clientset *kubern
 	// Multiple deployment tests
 	var err error
 	defer func() error {
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "local-deployment")
-		if err != nil {
-			slog.Fatal(err)
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		for i := 1; i < 5; i++ {
 			slog.Infof("🧹 deleting service [%s]", fmt.Sprintf("%s-%d", config.ServiceName, i))
 			err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, fmt.Sprintf("%s-%d", config.ServiceName, i), metav1.DeleteOptions{})
 			if err != nil {
-				slog.Fatal(err)
+				return err
 			}
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.LeaderName); err != nil {
-			slog.Fatal(err)
+		slog.Infof("🧹 deleting deployment [%s]", config.DeploymentName)
+		err := clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.LeaderName, metav1.DeleteOptions{})
+		if err != nil {
+			return err
 		}
 		return nil
 	}() //nolint
@@ -368,26 +310,17 @@ func (config *TestConfig) LocalDeployment(ctx context.Context, clientset *kubern

 func (config *TestConfig) EgressDeployment(ctx context.Context, clientset *kubernetes.Clientset, internal bool) error {
 	// egress test
+
 	var err error
 	defer func() error {
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "egress-deployment")
-		if err != nil {
-			slog.Fatal(err)
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 		err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 		if err != nil {
-			slog.Fatal(err)
+			return err
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
-			slog.Fatal(err)
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+		if err != nil {
+			return err
 		}
 		return nil
 	}() //nolint
@@ -459,24 +392,14 @@ func (config *TestConfig) Egressv6Deployment(ctx context.Context, clientset *kub

 	var err error
 	defer func() error {
-		tempDirPath, err := os.MkdirTemp(config.TempDirPath, "egress-v6-deployment")
-		if err != nil {
-			slog.Fatal(err)
-		}
-
-		if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-			slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-			return err
-		}
-
 		slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 		err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 		if err != nil {
-			slog.Fatal(err)
+			return err
 		}
-
-		if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
-			slog.Fatal(err)
+		err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+		if err != nil {
+			return err
 		}
 		return nil
 	}() //nolint
@@ -539,7 +462,7 @@ func (config *TestConfig) Egressv6Deployment(ctx context.Context, clientset *kub
 	}

 	if egress == "" {
-		return fmt.Errorf("no loadbalancer egress address found")
+		return fmt.Errorf("no loadbalancer address found")
 	}

 	found = tcpServer(&egress, timeout, "tcp6")
@@ -580,59 +503,14 @@ func (config *TestConfig) DualStackDeployment(ctx context.Context, clientset *ku

 	config.SuccessCounter++

-	tempDirPath, err := os.MkdirTemp(config.TempDirPath, "dualstack-deployment")
-	if err != nil {
-		slog.Fatal(err)
-	}
-
-	if err = e2e.GetLogs(ctx, clientset, tempDirPath); err != nil {
-		slog.Infof("🧪 ---> simple deployment getlogs err <---: %w", err)
-		return err
-	}
-
 	slog.Infof("🧹 deleting Service [%s], deployment [%s]", config.ServiceName, config.DeploymentName)
 	err = clientset.CoreV1().Services(v1.NamespaceDefault).Delete(ctx, config.ServiceName, metav1.DeleteOptions{})
 	if err != nil {
-		slog.Fatal(err)
+		return err
 	}
-
-	if err = deleteDeployment(ctx, clientset, config.DeploymentName); err != nil {
-		slog.Fatal(err)
+	err = clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, config.DeploymentName, metav1.DeleteOptions{})
+	if err != nil {
+		return err
 	}
 	return err
 }
-
-func deleteDeployment(ctx context.Context, clientset *kubernetes.Clientset, name string) error {
-	fgPropagation := metav1.DeletePropagationForeground
-	delOpts := metav1.DeleteOptions{
-		PropagationPolicy: &fgPropagation,
-	}
-
-	slog.Infof("🧹 deleting deployment [%s]", name)
-	if err := clientset.AppsV1().Deployments(v1.NamespaceDefault).Delete(ctx, name, delOpts); err != nil {
-		return fmt.Errorf("failed to delete deployment %q: %w", name, err)
-	}
-
-	slog.Infof("🧹 waiting for the deployment [%s] deletion", name)
-
-	t := time.NewTicker(time.Millisecond * 200)
-
-	checkCtx, checkCancel := context.WithTimeout(ctx, time.Second*30)
-	defer checkCancel()
-
-	for {
-		select {
-		case <-checkCtx.Done():
-			t.Stop()
-			return fmt.Errorf("failed to check deployment's %q deletion: %w", name, ctx.Err())
-		case <-t.C:
-			_, err := clientset.AppsV1().Deployments(v1.NamespaceDefault).Get(checkCtx, name, metav1.GetOptions{})
-			if err != nil && apierrors.IsNotFound(err) {
-				slog.Infof("🧹 deployment [%s] was deleted", name)
-				return nil
-			} else if err != nil {
-				return fmt.Errorf("failed to wait for the deployment %q to be deleted: %w", name, err)
-			}
-		}
-	}
-}