diff --git a/cloud/azure/modules/app/locals.tf b/cloud/azure/modules/app/locals.tf
index 3e1354c5..360cca07 100644
--- a/cloud/azure/modules/app/locals.tf
+++ b/cloud/azure/modules/app/locals.tf
@@ -19,8 +19,6 @@ locals {
     WEBSITES_ENABLE_APP_SERVICE_STORAGE = false
     PORT                                = 9000
 
-    DOCKER_REGISTRY_SERVER_URL = "https://index.docker.io"
-
     DB_USERNAME          = "${azurerm_postgresql_flexible_server.civiform.administrator_login}@${azurerm_postgresql_flexible_server.civiform.name}"
     DB_PASSWORD          = data.azurerm_key_vault_secret.postgres_password.value
     DB_JDBC_STRING       = "jdbc:postgresql://${azurerm_postgresql_flexible_server.civiform.name}.postgres.database.azure.com:5432/postgres?user=${azurerm_postgresql_flexible_server.civiform.administrator_login}&password=${azurerm_postgresql_flexible_server.civiform.administrator_password}&sslmode=require"
diff --git a/cloud/azure/modules/bastion/main.tf b/cloud/azure/modules/bastion/main.tf
index 6c5fc39a..33a0ccdd 100644
--- a/cloud/azure/modules/bastion/main.tf
+++ b/cloud/azure/modules/bastion/main.tf
@@ -39,7 +39,8 @@ resource "azurerm_public_ip" "public_ip" {
   name                = "${var.resource_group_name}-ip"
   location            = var.resource_group_location
   resource_group_name = var.resource_group_name
-  allocation_method   = "Dynamic"
+  # Standard SKUs (like what staging uses) requires Static allocation
+  allocation_method = "Static"
 }
 # prevent all access to the bastion's public IP address, but then in script 
 # set it up so that the current machine can access the public ip 
diff --git a/cloud/azure/templates/azure_saml_ses/providers.tf b/cloud/azure/templates/azure_saml_ses/providers.tf
index 615cb43d..012fec7e 100644
--- a/cloud/azure/templates/azure_saml_ses/providers.tf
+++ b/cloud/azure/templates/azure_saml_ses/providers.tf
@@ -1,3 +1,5 @@
 provider "azurerm" {
   features {}
+  # https://github.com/civiform/civiform/issues/8598
+  subscription_id = "4ef4ae1b-c966-4ac4-9b7c-a837ea410821"
 }
\ No newline at end of file