diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml
index 9181d2fe45..1fc8e5839e 100644
--- a/environments/ssl/tls-everywhere-endpoints-dns.yaml
+++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml
@@ -79,8 +79,8 @@ parameter_defaults:
     NovaVNCProxyAdmin: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
     NovaVNCProxyInternal: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
     NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}
-    OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
-    OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
+    OctaviaAdmin: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
+    OctaviaInternal: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
     OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
     OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
     OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 52d31f5198..f1f60dc83f 100644
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -418,8 +418,8 @@ environments:
             NovaVNCProxyAdmin: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
             NovaVNCProxyInternal: {protocol: 'https', port: '6080', host: 'CLOUDNAME'}
             NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}
-            OctaviaAdmin: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
-            OctaviaInternal: {protocol: 'https', port: '9876', host: 'IP_ADDRESS'}
+            OctaviaAdmin: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
+            OctaviaInternal: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
             OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
             OpenDaylightAdmin: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}
             OpenDaylightInternal: {protocol: 'https', port: '8081', host: 'CLOUDNAME'}