diff --git a/src/components/IOC/IOCBadge.js b/src/components/IOC/IOCBadge.js
index 227dfdf919a61eba94a524d9cf7237c00ef6964c..e61be5883a0c91db46202c58a3d54529012c89c7 100644
--- a/src/components/IOC/IOCBadge.js
+++ b/src/components/IOC/IOCBadge.js
@@ -4,6 +4,6 @@ import { IOCStatusIcon } from "./IOCIcons";
 
 export function IOCBadge({ ioc }) {
   return (
-    <IconBadge icon={<IOCStatusIcon ioc={ioc} />} title={ioc.namingName ?? ioc.name} subheader={ioc.activeDeployment?.host?.host || "---"} />
+    <IconBadge icon={<IOCStatusIcon ioc={ioc} />} title={ioc.namingName ?? ioc.name} subheader={ioc.activeDeployment?.host?.fqdn || "---"} />
   )
 }
\ No newline at end of file
diff --git a/src/components/IOC/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus.js
index 71c482d2cfef0a532689a3adfc0039ecca8664b0..02ee70a7ba5430d6c30e77b51446b6a5590653d3 100644
--- a/src/components/IOC/IOCLiveStatus.js
+++ b/src/components/IOC/IOCLiveStatus.js
@@ -13,7 +13,6 @@ import { IOCCommandTable } from "./IOCCommandTable";
 
 export function IOCLiveStatus({ ioc, ongoingCommand, commands, getCommands, buttonDisabled, setOperationQueued }) {
   const liveIOC = { ...ioc };
-  liveIOC.host = ioc.activeDeployment?.host.host;
   liveIOC.name = ioc.namingName;
   
   const getSubset = (ioc) => {
diff --git a/src/components/IOC/IOCManage.js b/src/components/IOC/IOCManage.js
index 8b828426eec70ee358749d5f0ca3a46760f517ec..b8cbb3416b377c8d1ce5e8b0f6b65ca6ad3e6a8f 100644
--- a/src/components/IOC/IOCManage.js
+++ b/src/components/IOC/IOCManage.js
@@ -37,7 +37,6 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) {
   if (ioc) {
     console.log({ ...ioc });
     const managedIOC = { ...ioc };
-    managedIOC.host = ioc.activeDeployment?.host.host;
 
     const getSubset = (ioc) => {
       ioc = { ...ioc };
@@ -46,7 +45,7 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) {
         // active, 
       } = ioc;
       const { sourceUrl: git } = ioc;
-      let host = ioc.activeDeployment?.host.host;
+      let host = ioc.activeDeployment?.host.fqdn;
 
       //create link if host is set
       if (ioc.activeDeployment) {
@@ -73,7 +72,7 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) {
 
     if (ioc.activeDeployment) {
       formInit.csEntryHost = {
-        fqdn: ioc.activeDeployment.host.host,
+        fqdn: ioc.activeDeployment.host.fqdn,
         id: ioc.activeDeployment.host.csEntryId,
       }
     }
diff --git a/src/components/IOC/IOCUndeployDialog.js b/src/components/IOC/IOCUndeployDialog.js
index a94486ac177c216fc7f0d3a3ade833a6b8993192..fac3db2582648529866e1bade08ddc44f6d7854f 100644
--- a/src/components/IOC/IOCUndeployDialog.js
+++ b/src/components/IOC/IOCUndeployDialog.js
@@ -30,7 +30,7 @@ export function IOCUndeployDialog({ open, setOpen, submitCallback, ioc , error }
         <DialogTitle id="form-dialog-title">Undeploy</DialogTitle>
         <DialogContent>
           <DialogContentText>
-            Do you really want to undeploy {ioc.namingName} from {ioc.activeDeployment.host.host}?
+            Do you really want to undeploy {ioc.namingName} from {ioc.activeDeployment.host.fqdn}?
           </DialogContentText>
           <TextField autoComplete="off" className={classes.textField} id="comment" label="Undeployment comment" variant="outlined" fullWidth/>
           {error ?