diff --git a/build/kafka-watcher.Dockerfile b/build/kafka-watcher.Dockerfile
index 6d5aa371..bfd575ed 100644
--- a/build/kafka-watcher.Dockerfile
+++ b/build/kafka-watcher.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21-alpine as buildenv
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as buildenv
 RUN apk add --no-cache ca-certificates git protoc
 RUN apk add build-base libpcap-dev
 WORKDIR /src
diff --git a/build/mapper.Dockerfile b/build/mapper.Dockerfile
index 2ba8e89e..dab1e778 100644
--- a/build/mapper.Dockerfile
+++ b/build/mapper.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21-alpine as buildenv
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as buildenv
 RUN apk add --no-cache ca-certificates git protoc
 RUN apk add build-base libpcap-dev
 WORKDIR /src
diff --git a/build/sniffer.Dockerfile b/build/sniffer.Dockerfile
index a4dbe382..f660bdae 100644
--- a/build/sniffer.Dockerfile
+++ b/build/sniffer.Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 golang:1.21-alpine as buildenv
+FROM --platform=linux/amd64 golang:1.22-alpine as buildenv
 RUN apk add --no-cache ca-certificates git protoc
 RUN apk add build-base libpcap-dev
 WORKDIR /src
@@ -14,7 +14,7 @@ RUN go test ./sniffer/... && echo dep > /dep
 
 # We start from the base image again, only this time it's using the target arch instead of always amd64. This is done to make the build faster.
 # Unlike the mapper, it can't be amd64 throughout and use Go's cross-compilation, since the sniffer depends on libpcap (C library).
-FROM golang:1.21-alpine as builder
+FROM golang:1.22-alpine as builder
 COPY --from=test /dep /dep
 RUN apk add --no-cache ca-certificates git protoc
 RUN apk add build-base libpcap-dev
diff --git a/src/go.mod b/src/go.mod
index e7540b41..c11b92c2 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -1,8 +1,6 @@
 module github.com/otterize/network-mapper/src
 
-go 1.21.5
-
-toolchain go1.22.0
+go 1.22.1
 
 require (
 	github.com/99designs/gqlgen v0.17.44
@@ -26,8 +24,8 @@ require (
 	github.com/nxadm/tail v1.4.8
 	github.com/oriser/regroup v0.0.0-20210730155327-fca8d7531263
 	github.com/otterize/go-procnet v0.1.1
-	github.com/otterize/intents-operator/src v0.0.0-20240415224106-28365bb34bb2
-	github.com/otterize/nilable v0.0.0-20230421170720-4a38614e35a9
+	github.com/otterize/intents-operator/src v0.0.0-20240428093949-7597a22e6e39
+	github.com/otterize/nilable v0.0.0-20240410132629-f242bb6f056f
 	github.com/prometheus/client_golang v1.18.0
 	github.com/samber/lo v1.33.0
 	github.com/sirupsen/logrus v1.9.3
diff --git a/src/go.sum b/src/go.sum
index 313613bc..bcbb8143 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -343,12 +343,12 @@ github.com/oriser/regroup v0.0.0-20210730155327-fca8d7531263 h1:Qd1Ml+uEhpesT8Og
 github.com/oriser/regroup v0.0.0-20210730155327-fca8d7531263/go.mod h1:odkMeLkWS8G6+WP2z3Pn2vkzhPSvBtFhAUYTKXAtZMQ=
 github.com/otterize/go-procnet v0.1.1 h1:5vRwX35VrsWcy2uP05sA4PmwpRoAu2L4vMJou4og8Kk=
 github.com/otterize/go-procnet v0.1.1/go.mod h1:WEm282HzrSVBZg6DX2fNB4dpVHBPTCjzHWvqOfauV+Q=
-github.com/otterize/intents-operator/src v0.0.0-20240415224106-28365bb34bb2 h1:QfdEYEoXDowz5CcTTbXmn7D8JhBTpXd5f7vuJkrF6eY=
-github.com/otterize/intents-operator/src v0.0.0-20240415224106-28365bb34bb2/go.mod h1:ymrDEakO51RVXB9Z9IKuXLDHX2pnTbYx4b/ecQFDUkg=
+github.com/otterize/intents-operator/src v0.0.0-20240428093949-7597a22e6e39 h1:KLj954SYQA6GuhKAJM0Ff1WFkbcHfINmTiYsNb9bQqQ=
+github.com/otterize/intents-operator/src v0.0.0-20240428093949-7597a22e6e39/go.mod h1:5KFX2JVBhSiEfcGfqmlDx1y0t0dbDZ9giTbVwFfFAYQ=
 github.com/otterize/lox v0.0.0-20220525164329-9ca2bf91c3dd h1:7Sb95VrtAPb9m2ewtqLnX1oeKQy03dt7yr6F/hP7Htg=
 github.com/otterize/lox v0.0.0-20220525164329-9ca2bf91c3dd/go.mod h1:RXvgymN8MxiELFkmGHzJ23KJU2ObVsNsNSM80/HO8qQ=
-github.com/otterize/nilable v0.0.0-20230421170720-4a38614e35a9 h1:udm0wViwIxP0ex4Z7PzD6ijk5EkYgZ05W/FS9KlLvC0=
-github.com/otterize/nilable v0.0.0-20230421170720-4a38614e35a9/go.mod h1:0CogLTO0b860xeB9tczr6r+D0a4dC+QlSl4tAZ//XqE=
+github.com/otterize/nilable v0.0.0-20240410132629-f242bb6f056f h1:gv92189CW53A+Y0UQ550zr6RfCBYqvYJ8oq6Jll1YqQ=
+github.com/otterize/nilable v0.0.0-20240410132629-f242bb6f056f/go.mod h1:9SNBrJbNRAl1isohKk/t1Px85HuxPFylfMmOMVtCg2Q=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=