diff --git a/infra/main.bicep b/infra/main.bicep
index 931035890..536b608ad 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -101,7 +101,7 @@ param backendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
 param backendContainerImageName string = 'km-api'
 
 @description('Optional. The Container Image Tag to deploy on the backend.')
-param backendContainerImageTag string = 'latest_waf'
+param backendContainerImageTag string = 'latest_waf_2025-09-18_898'
 
 @description('Optional. The Container Registry hostname where the docker images for the frontend are located.')
 param frontendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
@@ -110,7 +110,7 @@ param frontendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
 param frontendContainerImageName string = 'km-app'
 
 @description('Optional. The Container Image Tag to deploy on the frontend.')
-param frontendContainerImageTag string = 'latest_waf'
+param frontendContainerImageTag string = 'latest_waf_2025-09-18_898'
 
 @description('Optional. The tags to apply to all deployed Azure resources.')
 param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}
@@ -219,7 +219,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
       {
         TemplateName: 'KM Generic'
         CreatedBy: createdBy
-              },
+      },
       tags
     )
   }
@@ -1569,7 +1569,7 @@ output AZURE_EXISTING_AI_PROJECT_RESOURCE_ID string = existingAiFoundryAiProject
 output APPLICATIONINSIGHTS_CONNECTION_STRING string = enableMonitoring ? applicationInsights!.outputs.connectionString : ''
 
 @description('Contains API application URL.')
-output API_APP_URL string = 'https://app-${solutionName}.azurewebsites.net'
+output API_APP_URL string = 'https://api-${solutionSuffix}.azurewebsites.net'
 
 @description('Contains web application URL.')
-output WEB_APP_URL string = 'https://api-${solutionName}.azurewebsites.net'
+output WEB_APP_URL string = 'https://app-${solutionSuffix}.azurewebsites.net'
diff --git a/infra/main.json b/infra/main.json
index be162330f..29ba88cd9 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "18295975344394141399"
+      "templateHash": "15438166002668413819"
     }
   },
   "parameters": {
@@ -168,7 +168,7 @@
     },
     "backendContainerImageTag": {
       "type": "string",
-      "defaultValue": "latest_waf",
+      "defaultValue": "latest_waf_2025-09-18_898",
       "metadata": {
         "description": "Optional. The Container Image Tag to deploy on the backend."
       }
@@ -189,7 +189,7 @@
     },
     "frontendContainerImageTag": {
       "type": "string",
-      "defaultValue": "latest_waf",
+      "defaultValue": "latest_waf_2025-09-18_898",
       "metadata": {
         "description": "Optional. The Container Image Tag to deploy on the frontend."
       }
@@ -60138,14 +60138,14 @@
       "metadata": {
         "description": "Contains API application URL."
       },
-      "value": "[format('https://app-{0}.azurewebsites.net', parameters('solutionName'))]"
+      "value": "[format('https://api-{0}.azurewebsites.net', variables('solutionSuffix'))]"
     },
     "WEB_APP_URL": {
       "type": "string",
       "metadata": {
         "description": "Contains web application URL."
       },
-      "value": "[format('https://api-{0}.azurewebsites.net', parameters('solutionName'))]"
+      "value": "[format('https://app-{0}.azurewebsites.net', variables('solutionSuffix'))]"
     }
   }
 }
\ No newline at end of file