diff --git a/sdk/base/lib/osBindings/DerivedAddressInfo.ts b/sdk/base/lib/osBindings/DerivedAddressInfo.ts
index 464d17e25..79fb49bda 100644
--- a/sdk/base/lib/osBindings/DerivedAddressInfo.ts
+++ b/sdk/base/lib/osBindings/DerivedAddressInfo.ts
@@ -3,15 +3,15 @@ import type { HostnameInfo } from './HostnameInfo'
 
 export type DerivedAddressInfo = {
   /**
-   * User-controlled: private addresses the user has disabled
+   * User override: enable these addresses (only for public IP & port)
    */
-  enabled: Array<HostnameInfo>
+  enabled: Array<string>
   /**
-   * User-controlled: public addresses the user has enabled
+   * User override: disable these addresses (only for domains and private IP & port)
    */
-  disabled: Array<HostnameInfo>
+  disabled: Array<[string, number]>
   /**
    * COMPUTED: NetServiceData::update — all possible addresses for this binding
    */
-  possible: Array<HostnameInfo>
+  available: Array<HostnameInfo>
 }
diff --git a/sdk/base/lib/osBindings/Host.ts b/sdk/base/lib/osBindings/Host.ts
index cecc24475..3a655acb2 100644
--- a/sdk/base/lib/osBindings/Host.ts
+++ b/sdk/base/lib/osBindings/Host.ts
@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Bindings } from './Bindings'
+import type { GatewayId } from './GatewayId'
 import type { PublicDomainConfig } from './PublicDomainConfig'
 
 export type Host = {
   bindings: Bindings
   publicDomains: { [key: string]: PublicDomainConfig }
-  privateDomains: Array<string>
+  privateDomains: { [key: string]: Array<GatewayId> }
 }
diff --git a/sdk/base/lib/osBindings/HostnameInfo.ts b/sdk/base/lib/osBindings/HostnameInfo.ts
index 4d80dd43f..f38a0e908 100644
--- a/sdk/base/lib/osBindings/HostnameInfo.ts
+++ b/sdk/base/lib/osBindings/HostnameInfo.ts
@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { GatewayInfo } from './GatewayInfo'
-import type { IpHostname } from './IpHostname'
+import type { HostnameMetadata } from './HostnameMetadata'
 
 export type HostnameInfo = {
-  gateway: GatewayInfo
+  ssl: boolean
   public: boolean
-  hostname: IpHostname
+  host: string
+  port: number | null
+  metadata: HostnameMetadata
 }
diff --git a/sdk/base/lib/osBindings/HostnameMetadata.ts b/sdk/base/lib/osBindings/HostnameMetadata.ts
new file mode 100644
index 000000000..fd2ff3a14
--- /dev/null
+++ b/sdk/base/lib/osBindings/HostnameMetadata.ts
@@ -0,0 +1,10 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { GatewayId } from './GatewayId'
+import type { PackageId } from './PackageId'
+
+export type HostnameMetadata =
+  | { kind: 'ipv4'; gateway: GatewayId }
+  | { kind: 'ipv6'; gateway: GatewayId; scopeId: number }
+  | { kind: 'private-domain'; gateways: Array<GatewayId> }
+  | { kind: 'public-domain'; gateway: GatewayId }
+  | ({ kind: 'plugin'; package: PackageId } & { [key in string]?: unknown })
diff --git a/sdk/base/lib/osBindings/IpHostname.ts b/sdk/base/lib/osBindings/IpHostname.ts
deleted file mode 100644
index 6f6be463f..000000000
--- a/sdk/base/lib/osBindings/IpHostname.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type IpHostname =
-  | { kind: 'ipv4'; value: string; port: number | null; sslPort: number | null }
-  | {
-      kind: 'ipv6'
-      value: string
-      scopeId: number
-      port: number | null
-      sslPort: number | null
-    }
-  | {
-      kind: 'local'
-      value: string
-      port: number | null
-      sslPort: number | null
-    }
-  | {
-      kind: 'domain'
-      value: string
-      port: number | null
-      sslPort: number | null
-    }
diff --git a/sdk/base/lib/osBindings/index.ts b/sdk/base/lib/osBindings/index.ts
index 5dc4d2865..013118267 100644
--- a/sdk/base/lib/osBindings/index.ts
+++ b/sdk/base/lib/osBindings/index.ts
@@ -109,6 +109,7 @@ export { HardwareRequirements } from './HardwareRequirements'
 export { HealthCheckId } from './HealthCheckId'
 export { HostId } from './HostId'
 export { HostnameInfo } from './HostnameInfo'
+export { HostnameMetadata } from './HostnameMetadata'
 export { Hosts } from './Hosts'
 export { Host } from './Host'
 export { IdMap } from './IdMap'
@@ -122,7 +123,6 @@ export { InstalledVersionParams } from './InstalledVersionParams'
 export { InstallingInfo } from './InstallingInfo'
 export { InstallingState } from './InstallingState'
 export { InstallParams } from './InstallParams'
-export { IpHostname } from './IpHostname'
 export { IpInfo } from './IpInfo'
 export { KeyboardOptions } from './KeyboardOptions'
 export { ListPackageSignersParams } from './ListPackageSignersParams'