diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index cbe7659b..7d3d05ca 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -80,6 +80,18 @@ jobs:
           file: Dockerfile
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:${{ github.ref_type != 'tag' && github.ref_name || contains(github.ref, '-rc') && 'test' || 'prod' }}
-            ghcr.io/${{ github.repository }}:${{ github.ref_name }}
             ghcr.io/${{ github.repository }}:${{ github.sha }}
+
+      - name: Deploy to MST Azure Web App
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ vars.MST_AZURE_WEBAPP_NAME }}
+          images: ghcr.io/${{ github.repository }}:${{ github.sha }}
+          publish-profile: ${{ secrets.MST_AZURE_WEBAPP_PUBLISH_PROFILE }}
+
+      - name: Deploy to SBMTD Azure Web App
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ vars.SBMTD_AZURE_WEBAPP_NAME }}
+          images: ghcr.io/${{ github.repository }}:${{ github.sha }}
+          publish-profile: ${{ secrets.SBMTD_AZURE_WEBAPP_PUBLISH_PROFILE }}
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
index 81623cac..b631c360 100644
--- a/terraform/.terraform.lock.hcl
+++ b/terraform/.terraform.lock.hcl
@@ -5,6 +5,7 @@ provider "registry.terraform.io/hashicorp/azurerm" {
   version     = "3.28.0"
   constraints = ">= 3.0.0, < 4.0.0"
   hashes = [
+    "h1:eQRgBnX2TQ6H4q3sg4WUV1OhN21UdhQYrcyAnyu3U/U=",
     "h1:jnr5G4X8apGMF63WeMQn6gMGEoM87mI2lwTIj8D36Vg=",
     "h1:kCnbPOpHvjbMumJ6eeyyJ8r4VkD80bMz3C1OApc1yTI=",
     "zh:1c01bc8cba03c642d108df034744253ac7e625d7528d77ae57b65809cd08e519",
diff --git a/terraform/app_service.tf b/terraform/app_service.tf
index a35dfa57..e5c355df 100644
--- a/terraform/app_service.tf
+++ b/terraform/app_service.tf
@@ -41,15 +41,10 @@ resource "azurerm_linux_web_app" "main" {
       action      = "Allow"
       service_tag = "ApplicationInsightsAvailability"
     }
-
-    application_stack {
-      docker_image     = "ghcr.io/cal-itp/eligibility-server"
-      docker_image_tag = local.env_name
-    }
   }
 
   app_settings = {
-    "DOCKER_ENABLE_CI"            = "true",
+    "DOCKER_ENABLE_CI"            = "false",
     "DOCKER_REGISTRY_SERVER_URL"  = "https://ghcr.io/"
     "ELIGIBILITY_SERVER_SETTINGS" = "${local.mount_path}/settings.py"
     # this prevents the filesystem from being obscured by a mount
diff --git a/terraform/pipeline/deploy.yml b/terraform/pipeline/deploy.yml
index 4e17d54f..3dfe7ae2 100644
--- a/terraform/pipeline/deploy.yml
+++ b/terraform/pipeline/deploy.yml
@@ -34,7 +34,7 @@ stages:
           - task: TerraformInstaller@0
             displayName: Install Terraform
             inputs:
-              terraformVersion: 1.3.1
+              terraformVersion: 1.8.5
           # https://github.com/microsoft/azure-pipelines-terraform/tree/main/Tasks/TerraformTask/TerraformTaskV3#readme
           - task: TerraformTaskV3@3
             displayName: Terraform init