diff --git a/deploy/Terraform/.terraform.lock.hcl b/deploy/Terraform/.terraform.lock.hcl
index 2ad06fa..df27825 100644
--- a/deploy/Terraform/.terraform.lock.hcl
+++ b/deploy/Terraform/.terraform.lock.hcl
@@ -39,25 +39,3 @@ provider "registry.terraform.io/hashicorp/null" {
     "zh:ed0fe2acdb61330b01841fa790be00ec6beaac91d41f311fb8254f74eb6a711f",
   ]
 }
-
-provider "registry.terraform.io/kreuzwerker/docker" {
-  version     = "3.0.2"
-  constraints = "3.0.2"
-  hashes = [
-    "h1:DcRxJArfX6EiATluWeCBW7HoD6usz9fMoTK2U3dmyPk=",
-    "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f",
-    "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",
-    "zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138",
-    "zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da",
-    "zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2",
-    "zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06",
-    "zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1",
-    "zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710",
-    "zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005",
-    "zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d",
-    "zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792",
-    "zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387",
-    "zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62",
-    "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
-  ]
-}
diff --git a/deploy/Terraform/billing-alert.tf b/deploy/Terraform/billing-alert.tf
index 05404cc..aee9f6d 100644
--- a/deploy/Terraform/billing-alert.tf
+++ b/deploy/Terraform/billing-alert.tf
@@ -9,7 +9,7 @@ resource "azurerm_consumption_budget_subscription" "evently_budget" {
   time_grain = "Monthly"
 
   time_period {
-    start_date = "2025-09-01T00:00:00Z"
+    start_date = formatdate("YYYY-MM-01'T'00:00:00Z", plantimestamp())
   }
 
   notification {
diff --git a/deploy/Terraform/container-app.tf b/deploy/Terraform/container-app.tf
index 61831f3..1d873af 100644
--- a/deploy/Terraform/container-app.tf
+++ b/deploy/Terraform/container-app.tf
@@ -82,6 +82,8 @@ resource "azurerm_container_app" "app" {
     server   = azurerm_container_registry.acr.login_server
     identity = azurerm_user_assigned_identity.uami.id
   }
+  
+  depends_on = [azurerm_role_assignment.acr_pull, azurerm_mssql_database.db]
 
   # needed for container app to access other Microsoft Entra protected resources
   # https://learn.microsoft.com/en-us/azure/container-apps/managed-identity?tabs=portal%2Cdotnet
diff --git a/deploy/Terraform/main.tf b/deploy/Terraform/main.tf
index c70ae85..b3f042d 100644
--- a/deploy/Terraform/main.tf
+++ b/deploy/Terraform/main.tf
@@ -4,10 +4,13 @@ terraform {
       source  = "hashicorp/azurerm"
       version = "4.45.0"
     }
-    docker = {
-      source  = "kreuzwerker/docker"
-      version = "3.0.2"
-    }
+  }
+
+  backend "azurerm" {
+    resource_group_name  = "rg-sharedinfra-sea" # Resource group for the storage account
+    storage_account_name = "sasharedinfrasea"
+    container_name       = "evently-dev-sea"
+    key                  = "tfstate/terraform.tfstate"
   }
 }
 
diff --git a/deploy/Terraform/sql-database.tf b/deploy/Terraform/sql-database.tf
index bf6cfa6..74951e4 100644
--- a/deploy/Terraform/sql-database.tf
+++ b/deploy/Terraform/sql-database.tf
@@ -12,10 +12,10 @@ resource "azurerm_mssql_server" "sql_server" {
 }
 
 resource "azurerm_mssql_database" "db" {
-  name                        = "evently"
-  server_id                   = azurerm_mssql_server.sql_server.id
-  sku_name                    = "Basic" # Cheapest option: 5 DTUs
-  max_size_gb                 = 2       # Minimum size for Basic tier
+  name        = "evently"
+  server_id   = azurerm_mssql_server.sql_server.id
+  sku_name    = "Basic" # Cheapest option: 5 DTUs
+  max_size_gb = 2       # Minimum size for Basic tier
 }
 
 resource "azurerm_mssql_firewall_rule" "allow_azure_services" {