diff --git a/modules/high_availability_existing_vnet/locals.tf b/modules/high_availability_existing_vnet/locals.tf
index c39021c..2b41872 100755
--- a/modules/high_availability_existing_vnet/locals.tf
+++ b/modules/high_availability_existing_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "high_availability"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/high_availability_new_vnet/locals.tf b/modules/high_availability_new_vnet/locals.tf
index 9579de5..7e60623 100755
--- a/modules/high_availability_new_vnet/locals.tf
+++ b/modules/high_availability_new_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "high_availability_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/management_existing_vnet/locals.tf b/modules/management_existing_vnet/locals.tf
index 873657d..d0c0838 100755
--- a/modules/management_existing_vnet/locals.tf
+++ b/modules/management_existing_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "management_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/management_new_vnet/README.md b/modules/management_new_vnet/README.md
index 80d7307..edd5be6 100755
--- a/modules/management_new_vnet/README.md
+++ b/modules/management_new_vnet/README.md
@@ -27,8 +27,6 @@ module "example_module" {
 
     source  = "CheckPointSW/cloudguard-network-security/azure//modules/management_new_vnet"
     version = "1.0.4"
-
-
     source_image_vhd_uri            = "noCustomUri"
     resource_group_name             = "checkpoint-mgmt-terraform"
     mgmt_name                       = "checkpoint-mgmt-terraform"
diff --git a/modules/management_new_vnet/locals.tf b/modules/management_new_vnet/locals.tf
index 873657d..d0c0838 100755
--- a/modules/management_new_vnet/locals.tf
+++ b/modules/management_new_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "management_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/mds_existing_vnet/locals.tf b/modules/mds_existing_vnet/locals.tf
index cdca346..20053eb 100755
--- a/modules/mds_existing_vnet/locals.tf
+++ b/modules/mds_existing_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "mds_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/mds_new_vnet/locals.tf b/modules/mds_new_vnet/locals.tf
index cdca346..20053eb 100755
--- a/modules/mds_new_vnet/locals.tf
+++ b/modules/mds_new_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "mds_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/single_gateway_existing_vnet/locals.tf b/modules/single_gateway_existing_vnet/locals.tf
index 56cb061..f9af94a 100755
--- a/modules/single_gateway_existing_vnet/locals.tf
+++ b/modules/single_gateway_existing_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "single_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/single_gateway_new_vnet/locals.tf b/modules/single_gateway_new_vnet/locals.tf
index 56cb061..f9af94a 100755
--- a/modules/single_gateway_new_vnet/locals.tf
+++ b/modules/single_gateway_new_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "single_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/vmss_existing_vnet/locals.tf b/modules/vmss_existing_vnet/locals.tf
index 530c0a2..f391758 100755
--- a/modules/vmss_existing_vnet/locals.tf
+++ b/modules/vmss_existing_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "vmss_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/vmss_new_vnet/locals.tf b/modules/vmss_new_vnet/locals.tf
index 530c0a2..f391758 100755
--- a/modules/vmss_new_vnet/locals.tf
+++ b/modules/vmss_new_vnet/locals.tf
@@ -1,4 +1,4 @@
 locals {
   module_name = "vmss_terraform_registry"
-  module_version = "1.0.4"
+  module_version = "1.0.5"
 }
diff --git a/modules/vnet/main.tf b/modules/vnet/main.tf
index 17127b0..f4665fe 100755
--- a/modules/vnet/main.tf
+++ b/modules/vnet/main.tf
@@ -53,7 +53,7 @@ resource "azurerm_route_table" "frontend" {
     name = "To-Internal"
     address_prefix = var.address_space
     next_hop_type = local.next_hop_type_allowed_values[3]
-    next_hop_in_ip_address = substr(replace(azurerm_subnet.subnet[0].address_prefixes[0], "0/", "4/"), 0, local.address_prefix_length - 3)
+    next_hop_in_ip_address = join(".", [for i, v in split(".", element(split("/", azurerm_subnet.subnet[0].address_prefixes[0]), 0)) : i == 3 ? tostring(tonumber(v) + 4) : v])
   }
 }
 
@@ -72,7 +72,7 @@ resource "azurerm_route_table" "backend" {
     name = "To-Internet"
     address_prefix = "0.0.0.0/0"
     next_hop_type = local.next_hop_type_allowed_values[3]
-    next_hop_in_ip_address = substr(replace(azurerm_subnet.subnet[1].address_prefixes[0], "0/", "4/"), 0, local.address_prefix_length - 3)
+    next_hop_in_ip_address = join(".", [for i, v in split(".", element(split("/", azurerm_subnet.subnet[1].address_prefixes[0]), 0)) : i == 3 ? tostring(tonumber(v) + 4) : v])
   }
 }