diff --git a/infra-config/Chart.yaml b/infra-config/Chart.yaml
index 506d49d..514ef2b 100644
--- a/infra-config/Chart.yaml
+++ b/infra-config/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: infra-config
 description: Edge Infrastructure Manager Shared Configuration
 type: application
-version: 0.6.2
+version: 0.6.3
 appVersion: "1.0.0"
 annotations: {}
 home: edge-orchestrator.intel.com
diff --git a/infra-config/values.yaml b/infra-config/values.yaml
index 1251aaa..d7a9a5c 100644
--- a/infra-config/values.yaml
+++ b/infra-config/values.yaml
@@ -28,10 +28,11 @@ config:
   orchKeycloak: keycloak.kind.internal:443
   orchTelemetry: telemetry-node.kind.internal:443
   # TODO: remove below two lines
-  orchMPSHost: mps-node.kind.internal:4433
-  orchMPSWHost: mps-webport-node.kind.internal:443
-  orchRPSHost: rps-node.kind.internal:443
-  orchRPSWHost: rps-webport-node.kind.internal:443
+  orchMPSHost: mps.kind.internal:4433
+  orchMPSWHost: mps-wss.kind.internal:443
+  orchRPSHost: rps.kind.internal:443
+  orchRPSWHost: rps-wss.kind.internal:443
+  orchDeviceManager: device-manager-node.kind.internal:443
   orchTelemetryHost: telemetry-node.kind.internal
   orchTelemetryPort: 443
   orchRegistry: registry-rs.edgeorchestration.intel.com:9443
diff --git a/infra-onboarding/Chart.yaml b/infra-onboarding/Chart.yaml
index 2409213..216a073 100644
--- a/infra-onboarding/Chart.yaml
+++ b/infra-onboarding/Chart.yaml
@@ -5,8 +5,8 @@ apiVersion: v2
 name: infra-onboarding
 description: Edge Infrastructure Manager Onboarding Umbrella Chart
 type: application
-version: "1.33.0"
-appVersion: "1.33.0"
+version: "1.33.1"
+appVersion: "1.33.1"
 annotations: {}
 home: edge-orchestrator.intel.com
 maintainers:
@@ -26,7 +26,7 @@ dependencies:
     repository: "file://../tinkerbell"
   - name: infra-config
     condition: import.infra-config.enabled
-    version: "0.6.2"
+    version: "0.6.3"
     repository: "file://../infra-config"
   - name: pxe-server
     condition: import.pxe-server.enabled