diff --git a/main.tf b/main.tf
index a796ace..2f33292 100644
--- a/main.tf
+++ b/main.tf
@@ -183,6 +183,7 @@ module "bastion" {
   tags = local.tags
 }
 
+# TODO: Could be toggleable
 module "nat" {
   source = "./modules/nat"
 
@@ -205,7 +206,8 @@ module "vm" {
   location             = var.location
   resource_group_name  = azurerm_resource_group.graphdb.name
   resource_group_id    = azurerm_resource_group.graphdb.id
-  zones                = var.zones
+  # TODO: REVERT
+  zones                = [1, 3]
 
   graphdb_subnet_id   = azurerm_subnet.graphdb-vmss.id
   graphdb_subnet_cidr = one(azurerm_subnet.graphdb-vmss.address_prefixes)
diff --git a/modules/vm/main.tf b/modules/vm/main.tf
index 8a8d498..549ecd5 100644
--- a/modules/vm/main.tf
+++ b/modules/vm/main.tf
@@ -69,6 +69,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "graphdb" {
   zones        = var.zones
   zone_balance = true
   upgrade_mode = "Manual"
+  overprovision = false
 
   computer_name_prefix = "${var.resource_name_prefix}-"
   admin_username       = "graphdb"
@@ -83,11 +84,6 @@ resource "azurerm_linux_virtual_machine_scale_set" "graphdb" {
       primary                                      = true
       subnet_id                                    = var.graphdb_subnet_id
       application_gateway_backend_address_pool_ids = var.application_gateway_backend_address_pool_ids
-
-      # TODO: Temporary for testing. Remove after configuring the LB
-      public_ip_address {
-        name = "first"
-      }
     }
   }