diff --git a/.github/workflows/DeployBranchPush.yml b/.github/workflows/DeployBranchPush.yml
index 26a0a7d..8386b3e 100644
--- a/.github/workflows/DeployBranchPush.yml
+++ b/.github/workflows/DeployBranchPush.yml
@@ -1,14 +1,15 @@
 name: Deploy Branch Push
 on:
+  workflow_dispatch:
   push:
     branches-ignore:
       - 'main'
 
 jobs:
-  deploy_to_test:
+  deploy_to_dev:
     uses: ./.github/workflows/DeployEverything.yml
     with:
-      env: "Test2"
+      env: "dev"
     secrets: 
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
       AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
diff --git a/.github/workflows/DeployMainBranch.yml b/.github/workflows/DeployMainBranch.yml
index 5c70caf..d7cb16d 100644
--- a/.github/workflows/DeployMainBranch.yml
+++ b/.github/workflows/DeployMainBranch.yml
@@ -1,5 +1,6 @@
 name: Deploy Main to Production
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'main'
diff --git a/.github/workflows/DeployServerWebAPI.yml b/.github/workflows/DeployServerWebAPI.yml
index 3a3f4a6..8bd5456 100644
--- a/.github/workflows/DeployServerWebAPI.yml
+++ b/.github/workflows/DeployServerWebAPI.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Publish
       run: dotnet publish "${{ env.WORKING_DIRECTORY }}" --configuration ${{ env.CONFIGURATION }} --no-build --output "${{ env.AZURE_WEBAPP_PACKAGE_PATH }}"
     - name: Publish Artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: webapp
         path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
@@ -41,7 +41,7 @@ jobs:
       with:
         creds: '${{ secrets.AZURE_CREDENTIALS }}'
     - name: Download artifact from build job
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: webapp
         path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.dev.json b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.dev.json
new file mode 100644
index 0000000..7333da4
--- /dev/null
+++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.dev.json
@@ -0,0 +1,4 @@
+{
+  "apiUrl": "https://pocketddd-dev-api-server-web-app.azurewebsites.net/api/",
+  "fakeBackend": false
+}
\ No newline at end of file
diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.test.json b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.test.json
deleted file mode 100644
index f327669..0000000
--- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.test.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "apiUrl": "https://pocketddd-test-api-server-web-app.azurewebsites.net/api/",
-  "fakeBackend": false
-}
\ No newline at end of file
diff --git a/terraform/blazor_client.tf b/terraform/blazor_client.tf
index 4943190..e14041e 100644
--- a/terraform/blazor_client.tf
+++ b/terraform/blazor_client.tf
@@ -28,13 +28,13 @@ data "cloudflare_zone" "dns_zone" {
 resource "cloudflare_record" "cname_record" {
   zone_id = data.cloudflare_zone.dns_zone.id
   name    = local.subdomain
-  value   = azurerm_static_web_app.blazor-client.default_host_name
+  content = azurerm_static_web_app.blazor-client.default_host_name
   type    = "CNAME"
   ttl     = 3600
 }
 
 resource "azurerm_static_web_app_custom_domain" "custom_domain" {
   static_web_app_id = azurerm_static_web_app.blazor-client.id
-  domain_name       = "${cloudflare_record.cname_record.name}.${data.cloudflare_zone.dns_zone.name}"
+  domain_name       = "${cloudflare_record.cname_record.hostname}"
   validation_type   = "cname-delegation"
 }
diff --git a/tfvars/Test.tfvars b/tfvars/dev.tfvars
similarity index 91%
rename from tfvars/Test.tfvars
rename to tfvars/dev.tfvars
index 484b4d8..52b2019 100644
--- a/tfvars/Test.tfvars
+++ b/tfvars/dev.tfvars
@@ -1,4 +1,4 @@
-env = "test"
+env = "dev"
 sql_db_sku = "Basic"
 sql_max_storage = "2"
 api_app_service_sku = "F1"