-aai.server.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/\r
-aai.server.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/v13/\r
-aai.oldserver.url.base=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/\r
-aai.oldserver.url=https://${VID_AAI_HOST}:${VID_AAI_PORT}/aai/servers/v3/\r
+aai.server.url.base=${VID_AAI_URL}/aai/\r
+aai.server.url=${VID_AAI_URL}/aai/v13/\r
+aai.oldserver.url.base=${VID_AAI_URL}/aai/servers/\r
+aai.oldserver.url=${VID_AAI_URL}/aai/servers/v3/\r