diff --git a/examples/oc-phoenix/gateway.toml b/examples/oc-phoenix/gateway.toml
index 2ea1f23ec60..3ce3462226c 100644
--- a/examples/oc-phoenix/gateway.toml
+++ b/examples/oc-phoenix/gateway.toml
@@ -48,15 +48,17 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules]
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-"/home" = "localhost:12000"
+[grpc.services.storageregistry.drivers.static.rules."/home"]
+address = "localhost:12000"
 
 # mount a storage provider without a path wrapper for direct access to users.
-"/oc" = "localhost:11000"
-"123e4567-e89b-12d3-a456-426655440000" = "localhost:11000"
-# another mount point might be "/projects/" 
+[grpc.services.storageregistry.drivers.static.rules."/oc"]
+address = "localhost:11000"
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:11000"
+# another mount point might be "/projects/"
 
 [http]
 address = "0.0.0.0:19001"
diff --git a/examples/ocmd/ocmd-server-1.toml b/examples/ocmd/ocmd-server-1.toml
index e65b8233dd6..9d0335ced01 100644
--- a/examples/ocmd/ocmd-server-1.toml
+++ b/examples/ocmd/ocmd-server-1.toml
@@ -33,9 +33,10 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules]
-"/home" = "localhost:19000"
-"123e4567-e89b-12d3-a456-426655440000" = "localhost:19000"
+[grpc.services.storageregistry.drivers.static.rules."/home"]
+address = "localhost:19000"
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:19000"
 
 [grpc.services.usershareprovider]
 driver = "memory"
diff --git a/examples/ocmd/ocmd-server-2.toml b/examples/ocmd/ocmd-server-2.toml
index 3255843e587..321cdcd1cec 100644
--- a/examples/ocmd/ocmd-server-2.toml
+++ b/examples/ocmd/ocmd-server-2.toml
@@ -31,9 +31,10 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules]
-"/home" = "localhost:17000"
-"123e4567-e89b-12d3-a456-426655440000" = "localhost:17000"
+[grpc.services.storageregistry.drivers.static.rules."/home"]
+address = "localhost:17000"
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:17000"
 
 [grpc.services.usershareprovider]
 driver = "memory"
diff --git a/examples/storage-references/gateway.toml b/examples/storage-references/gateway.toml
index 1036acdd881..342d8fa17d1 100644
--- a/examples/storage-references/gateway.toml
+++ b/examples/storage-references/gateway.toml
@@ -10,7 +10,8 @@ home_provider = "/home"
 address = "localhost:17000"
 [grpc.services.storageregistry.drivers.static.rules."/reva"]
 address = "localhost:18000"
-
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:18000"
 
 [grpc.services.authprovider]
 [grpc.services.authregistry]
diff --git a/tests/oc-integration-tests/drone/gateway.toml b/tests/oc-integration-tests/drone/gateway.toml
index cd698955a67..a535422b3eb 100644
--- a/tests/oc-integration-tests/drone/gateway.toml
+++ b/tests/oc-integration-tests/drone/gateway.toml
@@ -53,17 +53,20 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules]
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-"/home" = "localhost:12000"
+[grpc.services.storageregistry.drivers.static.rules."/home"]
+address = "localhost:12000"
 
 # mount a storage provider without a path wrapper for direct access to users.
-"/oc" = "localhost:11000"
-"123e4567-e89b-12d3-a456-426655440000" = "localhost:11000"
+[grpc.services.storageregistry.drivers.static.rules."/oc"]
+address = "localhost:11000"
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:11000"
 # another mount point might be "/projects/"
 
-"/public" = "localhost:13000"
+[grpc.services.storageregistry.drivers.static.rules."/public"]
+address = "localhost:13000"
 
 [http]
 address = "0.0.0.0:19001"
diff --git a/tests/oc-integration-tests/local/gateway.toml b/tests/oc-integration-tests/local/gateway.toml
index 3805824a2b6..cfe0c341820 100644
--- a/tests/oc-integration-tests/local/gateway.toml
+++ b/tests/oc-integration-tests/local/gateway.toml
@@ -53,17 +53,20 @@ driver = "static"
 [grpc.services.storageregistry.drivers.static]
 home_provider = "/home"
 
-[grpc.services.storageregistry.drivers.static.rules]
 # mount a home storage provider that uses a context based path wrapper
 # to jail users into their home dir
-"/home" = "localhost:12000"
+[grpc.services.storageregistry.drivers.static.rules."/home"]
+address = "localhost:12000"
 
 # mount a storage provider without a path wrapper for direct access to users.
-"/users" = "localhost:11000"
-"123e4567-e89b-12d3-a456-426655440000" = "localhost:11000"
+[grpc.services.storageregistry.drivers.static.rules."/oc"]
+address = "localhost:11000"
+[grpc.services.storageregistry.drivers.static.rules."123e4567-e89b-12d3-a456-426655440000"]
+address = "localhost:11000"
 # another mount point might be "/projects/"
 
-"/public" = "localhost:13000"
+[grpc.services.storageregistry.drivers.static.rules."/public"]
+address = "localhost:13000"
 
 [http]
 address = "0.0.0.0:19001"