diff --git a/cmds/modules/api_gateway/main.go b/cmds/modules/api_gateway/main.go
index 7f31b58b..532bd7b7 100644
--- a/cmds/modules/api_gateway/main.go
+++ b/cmds/modules/api_gateway/main.go
@@ -11,13 +11,13 @@ import (
 	"github.com/cenkalti/backoff/v3"
 	"github.com/rs/zerolog/log"
 	substrate "github.com/threefoldtech/tfchain/clients/tfchain-client-go"
-	"github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go/peer"
 	"github.com/threefoldtech/zbus"
 	"github.com/threefoldtech/zos_base/pkg/environment"
 	"github.com/threefoldtech/zos_base/pkg/stubs"
 	substrategw "github.com/threefoldtech/zos_base/pkg/substrate_gateway"
 	"github.com/threefoldtech/zos_base/pkg/utils"
 	zosapi "github.com/threefoldtech/zos_base/pkg/zos_api_light"
+	"github.com/threefoldtech/zos_sdk_go/rmb-sdk-go/peer"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/go.mod b/go.mod
index 3e41979f..96c30238 100644
--- a/go.mod
+++ b/go.mod
@@ -35,9 +35,9 @@ require (
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56 // indirect
 	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00
-	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6
 	github.com/threefoldtech/zbus v1.0.1
-	github.com/threefoldtech/zos_base v1.1.0
+	github.com/threefoldtech/zos_base v1.1.1
+	github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0
 	github.com/urfave/cli/v2 v2.27.5
 	github.com/vishvananda/netlink v1.2.1-beta.2
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
diff --git a/go.sum b/go.sum
index 4db0f5b3..29474b0e 100644
--- a/go.sum
+++ b/go.sum
@@ -476,12 +476,12 @@ github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56 h1:uWd8JfE8N3
 github.com/threefoldtech/0-fs v1.3.1-0.20240424140157-b488dfedcc56/go.mod h1:lZjR32SiNo3dP70inVFxaLMyZjmKX1ucS+5O31dbPNM=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00 h1:Q/vkWlTfZBCo4SclrbpSV35sSg/EF2MIIi0LgxPdzCI=
 github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20260302124210-526158ffbc00/go.mod h1:cOL5YgHUmDG5SAXrsZxFjUECRQQuAqOoqvXhZG5sEUw=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6 h1:ymL6+ML2IIeMe+D6FVJkflRu7GFcDjWDE0tAIpjnSwA=
-github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.17.6/go.mod h1:LcdG5CnhtSHy1zuk3IeG8Fym78H55ZSngs8jxLmYPAU=
 github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk=
 github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
-github.com/threefoldtech/zosbase v1.0.10 h1:Gy2HUJIAWgxpvP322bxnu4QZ23jtuB1gDhiN+5PXCYk=
-github.com/threefoldtech/zosbase v1.0.10/go.mod h1:HIDT3p2LZsaUp4TQa5A/AB1MdW0YAPUEaK+lkc3gSsM=
+github.com/threefoldtech/zos_base v1.1.1 h1:sNOrhmQA13mPOck5GCdwpmH+R5xfzcfKCuXzxdsK5pI=
+github.com/threefoldtech/zos_base v1.1.1/go.mod h1:0OlU/EWyLlcm4a5fBYuOTOJ1K0PH53of6bZ392O60Qs=
+github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0 h1:CD8/yd0pAZINF93PHDODn2e+M6d5f6x6ECfpQac4kgw=
+github.com/threefoldtech/zos_sdk_go/rmb-sdk-go v0.18.0/go.mod h1:OI3omGvjs88MXvOKSfYULhxweQWSz6jvQuUHDTI98gw=
 github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -820,5 +820,3 @@ nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 zombiezen.com/go/capnproto2 v2.18.0+incompatible h1:mwfXZniffG5mXokQGHUJWGnqIBggoPfT/CEwon9Yess=
 zombiezen.com/go/capnproto2 v2.18.0+incompatible/go.mod h1:XO5Pr2SbXgqZwn0m0Ru54QBqpOf4K5AYBO+8LAOBQEQ=
-github.com/threefoldtech/zos_base v1.1.0 h1:WpjxPCzEgHOkMorhkKcpqRKXnsvL4euXOBnR2IdI/AM=
-github.com/threefoldtech/zos_base v1.1.0/go.mod h1:pVOuEZ6lobb3XPmiZwrzdxahuM29hU7wKqfX+Vih1cI=