diff --git a/openstack-tf/common_setups/16-ssh-keys.tf b/openstack-tf/common_setups/16-ssh-keys.tf
index 662d992b..a05f5b06 100644
--- a/openstack-tf/common_setups/16-ssh-keys.tf
+++ b/openstack-tf/common_setups/16-ssh-keys.tf
@@ -1,4 +1,4 @@
-resource "openstack_compute_keypair_v2" "initial_ssh_key" {
-        name = var.ssh_key_file.name
-        public_key = "${file("${var.ssh_key_file.file}.pub")}"
-}
+# resource "openstack_compute_keypair_v2" "initial_ssh_key" {
+#         name = var.ssh_key_file.name
+#         public_key = "${file("${var.ssh_key_file.file}.pub")}"
+# }
diff --git a/openstack-tf/common_setups/25-ssh-jump-proxy.tf b/openstack-tf/common_setups/25-ssh-jump-proxy.tf
index b923b6ea..b22e3a6c 100644
--- a/openstack-tf/common_setups/25-ssh-jump-proxy.tf
+++ b/openstack-tf/common_setups/25-ssh-jump-proxy.tf
@@ -3,7 +3,7 @@ resource "openstack_compute_instance_v2" "ssh_jump_proxy" {
   name = var.ssh_jump_proxy.name
   availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
   flavor_name = var.ssh_jump_proxy.flavor
-  key_pair = openstack_compute_keypair_v2.initial_ssh_key.name
+  key_pair = var.ssh_key_file.name
   security_groups = [openstack_networking_secgroup_v2.default.name,openstack_networking_secgroup_v2.access_to_the_jump_proxy.name]
   block_device {
     uuid                  = var.ubuntu_2204.uuid
diff --git a/openstack-tf/common_setups/30-internal-ca.tf b/openstack-tf/common_setups/30-internal-ca.tf
index a75c6535..4af256e2 100644
--- a/openstack-tf/common_setups/30-internal-ca.tf
+++ b/openstack-tf/common_setups/30-internal-ca.tf
@@ -2,7 +2,7 @@ resource "openstack_compute_instance_v2" "internal_ca" {
   name = var.internal_ca_data.name
   availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
   flavor_name = var.internal_ca_data.flavor
-  key_pair = openstack_compute_keypair_v2.initial_ssh_key.name
+  key_pair = var.ssh_key_file.name
   security_groups = [openstack_networking_secgroup_v2.default.name]
   block_device {
     uuid                  = var.ubuntu_2204.uuid
diff --git a/openstack-tf/common_setups/35-prometheus.tf b/openstack-tf/common_setups/35-prometheus.tf
index eab568b0..8730b5ae 100644
--- a/openstack-tf/common_setups/35-prometheus.tf
+++ b/openstack-tf/common_setups/35-prometheus.tf
@@ -8,7 +8,7 @@ resource "openstack_compute_instance_v2" "prometheus_server" {
   name = var.prometheus_server_data.name
   availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
   flavor_name = var.prometheus_server_data.flavor
-  key_pair = openstack_compute_keypair_v2.initial_ssh_key.name
+  key_pair = var.ssh_key_file.name
   security_groups = [openstack_networking_secgroup_v2.default.name,openstack_networking_secgroup_v2.restricted_web.name,openstack_networking_secgroup_v2.prometheus_access_from_grafana.name]
   block_device {
     uuid                  = var.ubuntu_2204.uuid
diff --git a/openstack-tf/common_setups/40-postgresql.tf b/openstack-tf/common_setups/40-postgresql.tf
index e7747e16..19c14e34 100644
--- a/openstack-tf/common_setups/40-postgresql.tf
+++ b/openstack-tf/common_setups/40-postgresql.tf
@@ -57,7 +57,7 @@ resource "openstack_compute_instance_v2" "shared_postgresql_server" {
   name = var.shared_postgresql_server_data.name
   availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
   flavor_name = var.shared_postgresql_server_data.flavor
-  key_pair = openstack_compute_keypair_v2.initial_ssh_key.name
+  key_pair = var.ssh_key_file.name
   security_groups = [openstack_networking_secgroup_v2.default.name,openstack_networking_secgroup_v2.shared_postgresql_access.name]
   block_device {
     uuid                  = var.ubuntu_2204.uuid
@@ -83,4 +83,5 @@ resource "openstack_compute_volume_attach_v2" "shared_postgresql_data_attach_vol
   instance_id = openstack_compute_instance_v2.shared_postgresql_server.id
   volume_id   = openstack_blockstorage_volume_v3.shared_postgresql_data_vol.id
   device = var.shared_postgresql_server_data.vol_data_device
+  depends_on = [openstack_compute_instance_v2.shared_postgresql_server]
 }
diff --git a/openstack-tf/common_setups/45-haproxy.tf b/openstack-tf/common_setups/45-haproxy.tf
index adedc353..b7dae51d 100644
--- a/openstack-tf/common_setups/45-haproxy.tf
+++ b/openstack-tf/common_setups/45-haproxy.tf
@@ -111,7 +111,7 @@ resource "openstack_compute_instance_v2" "main_haproxy_l7" {
   name = format("%s-%02d", var.haproxy_l7_data.name, count.index+1)
   availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
   flavor_name = var.haproxy_l7_data.flavor
-  key_pair = openstack_compute_keypair_v2.initial_ssh_key.name
+  key_pair = var.ssh_key_file.name
   security_groups = [openstack_networking_secgroup_v2.default.name,openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.name]
   block_device {
     uuid                  = var.ubuntu_2204.uuid
diff --git a/openstack-tf/d4s-production/basic-infrastructure/41-postgresql-backup-vol.tf b/openstack-tf/d4s-production/basic-infrastructure/41-postgresql-backup-vol.tf
index 302ab642..03595b2a 100644
--- a/openstack-tf/d4s-production/basic-infrastructure/41-postgresql-backup-vol.tf
+++ b/openstack-tf/d4s-production/basic-infrastructure/41-postgresql-backup-vol.tf
@@ -8,4 +8,5 @@ resource "openstack_compute_volume_attach_v2" "shared_postgresql_backup_attach_v
   instance_id = openstack_compute_instance_v2.shared_postgresql_server.id
   volume_id   = openstack_blockstorage_volume_v3.shared_postgresql_backup_vol.id
   device = var.shared_postgresql_server_data.vol_backup_device
+  depends_on = [openstack_compute_instance_v2.shared_postgresql_server]
 }
diff --git a/openstack-tf/d4s-production/variables/00-variables.tf b/openstack-tf/d4s-production/variables/00-variables.tf
index 7ded8876..1179db9f 100644
--- a/openstack-tf/d4s-production/variables/00-variables.tf
+++ b/openstack-tf/d4s-production/variables/00-variables.tf
@@ -91,7 +91,7 @@ variable "octavia_information" {
     # The following aren't available when the module runs so we have to get them with the command
     # openstack --os-cloud d4s-pre port list -f value | grep octavia-lb-vrrp
     # This means that the execution will fail
-    octavia_vrrp_ip_1 = "10.1.41.232"
-    octavia_vrrp_ip_2 = "10.1.42.229"
+    octavia_vrrp_ip_1 = "10.1.42.83/32"
+    octavia_vrrp_ip_2 = "10.1.44.249/32"
     }
 }