diff --git a/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml b/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml
index 4dfaabd..39c6a12 100644
--- a/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml
+++ b/deployments/aws/templates/ai-unlimited/ai-unlimited-with-nlb.yaml
@@ -29,7 +29,7 @@ Metadata:
           - AccessCIDR
           - PrefixList
           - SecurityGroup
-          - AiUnlimitedHttpPort
+          - AiUnlimitedAuthPort
           - AiUnlimitedGrpcPort
           - AiUnlimitedVersion
           - AiUnlimitedSchedulerVersion
@@ -103,7 +103,7 @@ Parameters:
     Type: AWS::EC2::AvailabilityZone::Name
     ConstraintDescription: must be the name of a existing subnet.
 
-  AiUnlimitedHttpPort:
+  AiUnlimitedAuthPort:
     Description: port to access the AI Unlimited UI.
     Type: Number
     Default: 3000
@@ -425,9 +425,9 @@ Resources:
             - create_init_api_key
             - mount_storage
             - install_docker
-            - configure_workspaces_ui_service
+            - configure_ai_unlimited_ui_service
             - configure_ai_unlimited_service
-            - start_workspaces_ui_service
+            - start_ai_unlimited_ui_service
             - start_ai_unlimited_service
             - configure_ai_unlimited_scheduler_service
             - start_ai_unlimited_scheduler_service
@@ -487,7 +487,7 @@ Resources:
               docker:
                 enabled: "true"
                 ensureRunning: "true"
-        configure_workspaces_ui_service:
+        configure_ai_unlimited_ui_service:
           files:
             /usr/lib/systemd/system/workspaces-ui.service:
               content: !Sub |
@@ -504,30 +504,30 @@ Resources:
                 RestartSec=2
                 
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/tmp/init_api_key.txt
                 ExecStartPre=-/usr/bin/docker stop %n || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
-                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 ExecStart=/usr/bin/docker run \
                   -e accept_license=Y \
                   -e PLATFORM=aws \
                   -e TD_VCD_UI_PORT=${ AiUnlimitedUiPort } \
-                  -e TD_VCD_API_PORT=3282 \
-                  -e TD_VCD_AUTH_PORT=3000 \
+                  -e TD_VCD_API_PORT=${ AiUnlimitedGrpcPort } \
+                  -e TD_VCD_AUTH_PORT=${ AiUnlimitedAuthPort } \
                   -e TD_VCD_INIT_API_KEY \
                   -p ${ AiUnlimitedUiPort }:80 \
                   --network ai_unlimited \
-                  --rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                  --rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 [Install]
                 WantedBy=multi-user.target
               group: root
               mode: "000400"
               owner: root
-        start_workspaces_ui_service:
+        start_ai_unlimited_ui_service:
           services:
             systemd:
-              workspaces-ui:
+              ai-unlimited-ui:
                 enabled: "true"
                 ensureRunning: "true"
         configure_ai_unlimited_service:
@@ -555,7 +555,7 @@ Resources:
                     -e PLATFORM=aws \
                     -e TD_VCD_INIT_API_KEY \
                     -v /etc/td/ai-unlimited:/etc/td \
-                    -p ${ AiUnlimitedHttpPort }:3000 \
+                    -p ${ AiUnlimitedAuthPort }:3000 \
                     -p ${ AiUnlimitedGrpcPort }:3282 \
                     --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-workspaces:${ AiUnlimitedVersion } workspaces serve -v
@@ -669,9 +669,9 @@ Resources:
       VpcId: !Ref Vpc
       GroupDescription: Enable access to AI Unlimited server from LoadBalancer over http, grpc, and ssh
       SecurityGroupIngress:
-        - FromPort: !Ref AiUnlimitedHttpPort
+        - FromPort: !Ref AiUnlimitedAuthPort
           IpProtocol: tcp
-          ToPort: !Ref AiUnlimitedHttpPort
+          ToPort: !Ref AiUnlimitedAuthPort
           CidrIp: !If
             - HASCIDR
             - !Ref AccessCIDR
@@ -764,7 +764,7 @@ Resources:
         - Type: forward
           TargetGroupArn: !Ref AiUnlimitedHTTPTargetGroup
       LoadBalancerArn: !Ref LoadBalancer
-      Port: !Ref AiUnlimitedHttpPort
+      Port: !Ref AiUnlimitedAuthPort
       Protocol: TCP
 
   AiUnlimitedGRPCListener:
@@ -827,7 +827,7 @@ Resources:
           - td-aiu
           - ui
           - http
-      Port: !Ref AiUnlimitedHttpPort
+      Port: !Ref AiUnlimitedAuthPort
       Protocol: TCP
       TargetGroupAttributes:
         - Key: stickiness.enabled
@@ -838,7 +838,7 @@ Resources:
           Value: "20"
       Targets:
         - Id: !Ref AiUnlimitedServer
-          Port: !Ref AiUnlimitedHttpPort
+          Port: !Ref AiUnlimitedAuthPort
       VpcId: !Ref Vpc
 
   AiUnlimitedUITargetGroup:
@@ -988,8 +988,8 @@ Resources:
       GroupDescription: Enable access to AI Unlimited server over http and grpc
       SecurityGroupIngress:
         - IpProtocol: tcp
-          FromPort: !Ref AiUnlimitedHttpPort
-          ToPort: !Ref AiUnlimitedHttpPort
+          FromPort: !Ref AiUnlimitedAuthPort
+          ToPort: !Ref AiUnlimitedAuthPort
           SourceSecurityGroupId: !GetAtt LoadBalancerAiUnlimitedSecurityGroup.GroupId
         - IpProtocol: tcp
           FromPort: !Ref AiUnlimitedGrpcPort
@@ -1002,8 +1002,8 @@ Resources:
         - !If
           - HASSECURITYGROUP
           - IpProtocol: tcp
-            FromPort: !Ref AiUnlimitedHttpPort
-            ToPort: !Ref AiUnlimitedHttpPort
+            FromPort: !Ref AiUnlimitedAuthPort
+            ToPort: !Ref AiUnlimitedAuthPort
             SourceSecurityGroupId: !Ref SecurityGroup
           - !Ref AWS::NoValue
         - !If
@@ -1290,7 +1290,7 @@ Outputs:
     Description: Loadbalancer access endpoint for AI Unlimited UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/landing"
+      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck"
       - !Sub "http://${ LoadBalancer.DNSName }"
 
   AiUnlimitedApiAccess:
diff --git a/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml b/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml
index a21c9fe..c18d840 100644
--- a/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml
+++ b/deployments/aws/templates/ai-unlimited/ai-unlimited-without-lb.yaml
@@ -27,7 +27,7 @@ Metadata:
           - AccessCIDR
           - PrefixList
           - SecurityGroup
-          - AiUnlimitedHttpPort
+          - AiUnlimitedAuthPort
           - AiUnlimitedGrpcPort
           - AiUnlimitedVersion
           - AiUnlimitedSchedulerVersion
@@ -88,7 +88,7 @@ Parameters:
     Type: AWS::EC2::AvailabilityZone::Name
     ConstraintDescription: must be the name of a existing subnet.
 
-  AiUnlimitedHttpPort:
+  AiUnlimitedAuthPort:
     Description: port to access the AI Unlimited UI.
     Type: Number
     Default: 3000
@@ -421,9 +421,9 @@ Resources:
             - create_init_api_key
             - mount_storage
             - install_docker
-            - configure_workspaces_ui_service
+            - configure_ai_unlimited_ui_service
             - configure_ai_unlimited_service
-            - start_workspaces_ui_service
+            - start_ai_unlimited_ui_service
             - start_ai_unlimited_service
             - configure_ai_unlimited_scheduler_service
             - start_ai_unlimited_scheduler_service
@@ -484,12 +484,12 @@ Resources:
                 enabled: "true"
                 ensureRunning: "true"
 
-        configure_workspaces_ui_service:
+        configure_ai_unlimited_ui_service:
           files:
-            /usr/lib/systemd/system/workspaces-ui.service:
+            /usr/lib/systemd/system/ai-unlimited-ui.service:
               content: !Sub |
                 [Unit]
-                Description=workspaces-ui
+                Description=ai-unlimited-ui
                 After=docker.service
                 Requires=docker.service
                 StartLimitInterval=200
@@ -501,30 +501,30 @@ Resources:
                 RestartSec=2
                 
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/tmp/init_api_key.txt
                 ExecStartPre=-/usr/bin/docker stop %n || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
-                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 ExecStart=/usr/bin/docker run \
                   -e accept_license=Y \
                   -e PLATFORM=aws \
                   -e TD_VCD_UI_PORT=${ AiUnlimitedUiPort } \
-                  -e TD_VCD_API_PORT=3282 \
-                  -e TD_VCD_AUTH_PORT=3000 \
+                  -e TD_VCD_API_PORT=${ AiUnlimitedGrpcPort } \
+                  -e TD_VCD_AUTH_PORT=${ AiUnlimitedAuthPort } \
                   -e TD_VCD_INIT_API_KEY \
                   -p ${ AiUnlimitedUiPort }:80 \
                   --network ai_unlimited \
-                  --rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                  --rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 [Install]
                 WantedBy=multi-user.target
               group: root
               mode: "000400"
               owner: root
-        start_workspaces_ui_service:
+        start_ai_unlimited_ui_service:
           services:
             systemd:
-              workspaces-ui:
+              ai-unlimited-ui:
                 enabled: "true"
                 ensureRunning: "true"
 
@@ -553,7 +553,7 @@ Resources:
                     -e PLATFORM=aws \
                     -e TD_VCD_INIT_API_KEY \
                     -v /etc/td/ai-unlimited:/etc/td \
-                    -p ${ AiUnlimitedHttpPort }:3000 \
+                    -p ${ AiUnlimitedAuthPort }:3000 \
                     -p ${ AiUnlimitedGrpcPort }:3282 \
                     --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-workspaces:${ AiUnlimitedVersion } workspaces serve -v
@@ -668,9 +668,9 @@ Resources:
       VpcId: !Ref Vpc
       GroupDescription: Enable access to AI Unlimited server over http and grpc
       SecurityGroupIngress:
-        - FromPort: !Ref AiUnlimitedHttpPort
+        - FromPort: !Ref AiUnlimitedAuthPort
           IpProtocol: tcp
-          ToPort: !Ref AiUnlimitedHttpPort
+          ToPort: !Ref AiUnlimitedAuthPort
           CidrIp: !If
             - HASCIDR
             - !Ref AccessCIDR
@@ -987,7 +987,7 @@ Outputs:
   AiUnlimitedPublicUIAccess:
     Description: Teradata AI Unlimited public UI Access
     Value: !If [ PortIsNotEightyAndHasPublicIp,
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/landing",
+                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck",
                  !Sub "http://${AiUnlimitedServer.PublicDnsName}" ]
     Condition: HASPUBLICIP
 
@@ -995,7 +995,7 @@ Outputs:
     Description: Teradata AI Unlimited private UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/landing"
+      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck"
       - !Sub "http://${AiUnlimitedServer.PrivateDnsName}"
 
   AiUnlimitedPublicAPIAccess:
diff --git a/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml b/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml
index 59cdb43..9492ed0 100644
--- a/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml
+++ b/deployments/aws/templates/all-in-one/all-in-one-with-nlb.yaml
@@ -29,7 +29,7 @@ Metadata:
           - AccessCIDR
           - PrefixList
           - SecurityGroup
-          - AiUnlimitedHttpPort
+          - AiUnlimitedAuthPort
           - AiUnlimitedGrpcPort
           - AiUnlimitedVersion
           - AiUnlimitedSchedulerVersion
@@ -117,7 +117,7 @@ Parameters:
     Type: AWS::EC2::AvailabilityZone::Name
     ConstraintDescription: must be the name of a existing subnet.
 
-  AiUnlimitedHttpPort:
+  AiUnlimitedAuthPort:
     Description: port to access the AI Unlimited UI.
     Type: Number
     Default: 3000
@@ -441,10 +441,10 @@ Resources:
             - create_init_api_key
             - mount_storage
             - install_docker
-            - configure_workspaces_ui_service
+            - configure_ai_unlimited_ui_service
             - configure_ai_unlimited_service
             - configure_jupyter_service
-            - start_workspaces_ui_service
+            - start_ai_unlimited_ui_service
             - start_ai_unlimited_service
             - configure_ai_unlimited_scheduler_service
             - start_ai_unlimited_scheduler_service
@@ -505,12 +505,12 @@ Resources:
               docker:
                 enabled: "true"
                 ensureRunning: "true"
-        configure_workspaces_ui_service:
+        configure_ai_unlimited_ui_service:
           files:
-            /usr/lib/systemd/system/workspaces-ui.service:
+            /usr/lib/systemd/system/ai-unlimited-ui.service:
               content: !Sub |
                 [Unit]
-                Description=workspaces-ui
+                Description=ai-unlimited-ui
                 After=docker.service
                 Requires=docker.service
                 StartLimitInterval=200
@@ -522,11 +522,11 @@ Resources:
                 RestartSec=2
                 
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/tmp/init_api_key.txt
                 ExecStartPre=-/usr/bin/docker stop %n || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
-                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 ExecStart=/usr/bin/docker run \
                   -e accept_license=Y \
                   -e PLATFORM=aws \
@@ -536,16 +536,16 @@ Resources:
                   -e TD_VCD_INIT_API_KEY \
                   -p ${ AiUnlimitedUiPort }:80 \
                   --network ai_unlimited \
-                  --rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                  --rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 [Install]
                 WantedBy=multi-user.target
               group: root
               mode: "000400"
               owner: root
-        start_workspaces_ui_service:
+        start_ai_unlimited_ui_service:
           services:
             systemd:
-              workspaces-ui:
+              ai-unlimited-ui:
                 enabled: "true"
                 ensureRunning: "true"
         configure_ai_unlimited_service:
@@ -573,7 +573,7 @@ Resources:
                     -e PLATFORM=aws \
                     -e TD_VCD_INIT_API_KEY \
                     -v /etc/td/ai-unlimited:/etc/td \
-                    -p ${ AiUnlimitedHttpPort }:3000 \
+                    -p ${ AiUnlimitedAuthPort }:3000 \
                     -p ${ AiUnlimitedGrpcPort }:3282 \
                     --network ai_unlimited \
                     --net-alias ${ LoadBalancer.DNSName } \
@@ -728,9 +728,9 @@ Resources:
       VpcId: !Ref Vpc
       GroupDescription: Enable access to AI Unlimited server from LoadBalancer over http, grpc, and ssh
       SecurityGroupIngress:
-        - FromPort: !Ref AiUnlimitedHttpPort
+        - FromPort: !Ref AiUnlimitedAuthPort
           IpProtocol: tcp
-          ToPort: !Ref AiUnlimitedHttpPort
+          ToPort: !Ref AiUnlimitedAuthPort
           CidrIp: !If
             - HASCIDR
             - !Ref AccessCIDR
@@ -847,7 +847,7 @@ Resources:
         - Type: forward
           TargetGroupArn: !Ref AiUnlimitedHTTPTargetGroup
       LoadBalancerArn: !Ref LoadBalancer
-      Port: !Ref AiUnlimitedHttpPort
+      Port: !Ref AiUnlimitedAuthPort
       Protocol: TCP
 
   AiUnlimitedUIListener:
@@ -920,7 +920,7 @@ Resources:
           - td-aiu
           - ui
           - http
-      Port: !Ref AiUnlimitedHttpPort
+      Port: !Ref AiUnlimitedAuthPort
       Protocol: TCP
       TargetGroupAttributes:
         - Key: stickiness.enabled
@@ -931,7 +931,7 @@ Resources:
           Value: "20"
       Targets:
         - Id: !Ref AiUnlimitedServer
-          Port: !Ref AiUnlimitedHttpPort
+          Port: !Ref AiUnlimitedAuthPort
       VpcId: !Ref Vpc
 
   AiUnlimitedUITargetGroup:
@@ -1115,8 +1115,8 @@ Resources:
       GroupDescription: Enable access to AI Unlimited server over http and grpc
       SecurityGroupIngress:
         - IpProtocol: tcp
-          FromPort: !Ref AiUnlimitedHttpPort
-          ToPort: !Ref AiUnlimitedHttpPort
+          FromPort: !Ref AiUnlimitedAuthPort
+          ToPort: !Ref AiUnlimitedAuthPort
           SourceSecurityGroupId: !GetAtt LoadBalancerAiUnlimitedSecurityGroup.GroupId
         - IpProtocol: tcp
           FromPort: !Ref AiUnlimitedGrpcPort
@@ -1129,8 +1129,8 @@ Resources:
         - !If
           - HASSECURITYGROUP
           - IpProtocol: tcp
-            FromPort: !Ref AiUnlimitedHttpPort
-            ToPort: !Ref AiUnlimitedHttpPort
+            FromPort: !Ref AiUnlimitedAuthPort
+            ToPort: !Ref AiUnlimitedAuthPort
             SourceSecurityGroupId: !Ref SecurityGroup
           - !Ref AWS::NoValue
         - !If
@@ -1443,7 +1443,7 @@ Outputs:
     Description: Loadbalancer access endpoint for AI Unlimited UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/landing"
+      - !Sub "http://${ LoadBalancer.DNSName }:${ AiUnlimitedUiPort }/healthcheck"
       - !Sub "http://${ LoadBalancer.DNSName }"
 
   AiUnlimitedApiAccess:
diff --git a/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml b/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml
index 1d1087e..4755ba1 100644
--- a/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml
+++ b/deployments/aws/templates/all-in-one/all-in-one-without-lb.yaml
@@ -27,7 +27,7 @@ Metadata:
           - AccessCIDR
           - PrefixList
           - SecurityGroup
-          - AiUnlimitedHttpPort
+          - AiUnlimitedAuthPort
           - AiUnlimitedGrpcPort
           - AiUnlimitedVersion
           - AiUnlimitedSchedulerVersion
@@ -102,8 +102,8 @@ Parameters:
     Type: AWS::EC2::AvailabilityZone::Name
     ConstraintDescription: must be the name of a existing subnet.
 
-  AiUnlimitedHttpPort:
-    Description: port to access the AI Unlimited UI.
+  AiUnlimitedAuthPort:
+    Description: port to access the AI Unlimited Authentication Service.
     Type: Number
     Default: 3000
     ConstraintDescription: must be a valid ununsed port between 0 and 65535.
@@ -437,9 +437,9 @@ Resources:
             - create_init_api_key
             - mount_storage
             - install_docker
-            - configure_workspaces_ui_service
+            - configure_ai_unlimited_ui_service
             - configure_ai_unlimited_service
-            - start_workspaces_ui_service
+            - start_ai_unlimited_ui_service
             - start_ai_unlimited_service
             - configure_jupyter_service
             - configure_ai_unlimited_scheduler_service
@@ -501,12 +501,12 @@ Resources:
               docker:
                 enabled: "true"
                 ensureRunning: "true"
-        configure_workspaces_ui_service:
+        configure_ai_unlimited_ui_service:
           files:
-            /usr/lib/systemd/system/workspaces-ui.service:
+            /usr/lib/systemd/system/ai-unlimited-ui.service:
               content: !Sub |
                 [Unit]
-                Description=workspaces-ui
+                Description=ai-unlimited-ui
                 After=docker.service
                 Requires=docker.service
                 StartLimitInterval=200
@@ -518,30 +518,30 @@ Resources:
                 RestartSec=2
                 
                 ExecStartPre=-/bin/bash -c '/usr/bin/docker network create -d bridge ai_unlimited || true'
-                ExecStartPre=-/usr/bin/mkdir -p /etc/td/workspaces-ui
+                ExecStartPre=-/usr/bin/mkdir -p /etc/td/ai-unlimited-ui
                 EnvironmentFile=/tmp/init_api_key.txt
                 ExecStartPre=-/usr/bin/docker stop %n || true
                 ExecStartPre=-/usr/bin/docker rm %n || true
-                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                ExecStartPre=/usr/bin/docker pull teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 ExecStart=/usr/bin/docker run \
                   -e accept_license=Y \
                   -e PLATFORM=aws \
                   -e TD_VCD_UI_PORT=${ AiUnlimitedUiPort } \
-                  -e TD_VCD_API_PORT=3282 \
-                  -e TD_VCD_AUTH_PORT=3000 \
+                  -e TD_VCD_API_PORT=${ AiUnlimitedGrpcPort } \
+                  -e TD_VCD_AUTH_PORT=${ AiUnlimitedAuthPort } \
                   -e TD_VCD_INIT_API_KEY \
                   -p ${ AiUnlimitedUiPort }:80 \
                   --network ai_unlimited \
-                  --rm --name %n teradata/ai-unlimited-workspaces-ui:${ AiUnlimitedUiVersion }
+                  --rm --name %n teradata/ai-unlimited-ui:${ AiUnlimitedUiVersion }
                 [Install]
                 WantedBy=multi-user.target
               group: root
               mode: "000400"
               owner: root
-        start_workspaces_ui_service:
+        start_ai_unlimited_ui_service:
           services:
             systemd:
-              workspaces-ui:
+              ai-unlimited-ui:
                 enabled: "true"
                 ensureRunning: "true"
         configure_ai_unlimited_service:
@@ -569,7 +569,7 @@ Resources:
                     -e PLATFORM=aws \
                     -e TD_VCD_INIT_API_KEY \
                     -v /etc/td/ai-unlimited:/etc/td \
-                    -p ${ AiUnlimitedHttpPort }:3000 \
+                    -p ${ AiUnlimitedAuthPort }:3000 \
                     -p ${ AiUnlimitedGrpcPort }:3282 \
                     --network ai_unlimited \
                     --rm --name %n teradata/ai-unlimited-workspaces:${ AiUnlimitedVersion } workspaces serve -v
@@ -722,9 +722,9 @@ Resources:
       VpcId: !Ref Vpc
       GroupDescription: Enable access to AI Unlimited server over http and grpc
       SecurityGroupIngress:
-        - FromPort: !Ref AiUnlimitedHttpPort
+        - FromPort: !Ref AiUnlimitedAuthPort
           IpProtocol: tcp
-          ToPort: !Ref AiUnlimitedHttpPort
+          ToPort: !Ref AiUnlimitedAuthPort
           CidrIp: !If
             - HASCIDR
             - !Ref AccessCIDR
@@ -1067,7 +1067,7 @@ Outputs:
   AiUnlimitedPublicUIAccess:
     Description: Teradata AI Unlimited public UI Access
     Value: !If [ PortIsNotEightyAndHasPublicIp,
-                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/landing",
+                 !Sub "http://${AiUnlimitedServer.PublicDnsName}:${AiUnlimitedUiPort}/healthcheck",
                  !Sub "http://${AiUnlimitedServer.PublicDnsName}" ]
     Condition: HASPUBLICIP
 
@@ -1075,7 +1075,7 @@ Outputs:
     Description: Teradata AI Unlimited private UI Access
     Value: !If
       - PortIsNotEighty
-      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/landing"
+      - !Sub "http://${AiUnlimitedServer.PrivateDnsName}:${AiUnlimitedUiPort}/healthcheck"
       - !Sub "http://${AiUnlimitedServer.PrivateDnsName}"
 
   AiUnlimitedPublicAPIAccess: