diff --git a/openstack-tf/d4s-production/geoserver/main.tf b/openstack-tf/d4s-production/geoserver/main.tf
index 4155be6..d54d89e 100644
--- a/openstack-tf/d4s-production/geoserver/main.tf
+++ b/openstack-tf/d4s-production/geoserver/main.tf
@@ -25,15 +25,6 @@ module "common_variables" {
 }
 
 
-#
-# Creates the server group "geoserver"
-#
-resource "openstack_compute_servergroup_v2" "geoserver_server_group" {
-  name     = "geoserver"
-  policies = [module.common_variables.policy_list.soft_anti_affinity]
-}
-
-
 module "instance_with_data_volume" {
   source = "../../modules/instance_with_data_volume"
 
@@ -42,9 +33,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-geona",
       description       = "Geoserver geona instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_geona_data_volume",
@@ -56,9 +47,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-esquiline",
       description       = "Geoserver esquiline instance",
       flavor            = module.common_variables.flavor_list.m2_small,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_esquiline_data_volume",
@@ -70,9 +61,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-ariadne",
       description       = "Geoserver ariadne instance",
       flavor            = module.common_variables.flavor_list.m2_small,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     =  "geoserver_ariadne_data_volume",
@@ -84,9 +75,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-grsf",
       description       = "Geoserver grsf instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804
       volume = {
         name     = "geoserver_grsf_data_volume"
@@ -98,9 +89,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-protectedareaimpactmaps",
       description       = "Geoserver protectedareaimpactmaps instance",
       flavor            = module.common_variables.flavor_list.c1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_protectedareaimpactmaps_data_volume"
@@ -112,9 +103,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-sdilab",
       description       = "Geoserver sdilab instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_sdilab_data_volume",
@@ -126,9 +117,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-tunaatlas",
       description       = "Geoserver tunaatlas instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_tunaatlas_data_volume",
@@ -140,9 +131,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-wecafcfirms",
       description       = "Geoserver wecafcfirms instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_wecafcfirms_data_volume",
@@ -154,9 +145,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-aquacultureatlas",
       description       = "Geoserver aquacultureatlas instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_aquacultureatlas_data_volume",
@@ -168,9 +159,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-globalfisheriesatlas",
       description       = "Geoserver globalfisheriesatlas instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_globalfisheriesatlas_data_volume",
@@ -182,9 +173,9 @@ module "instance_with_data_volume" {
       name              = "geoserver-marineenvironmentalindicators",
       description       = "Geoserver marineenvironmentalindicators instance",
       flavor            = module.common_variables.flavor_list.m1_large,
-      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.shared_postgresql],
-      security_groups   = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
-      server_groups_ids = [openstack_compute_servergroup_v2.geoserver_server_group.id],
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name,module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, module.common_variables.security_group_list.http_and_https_from_the_load_balancers],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804,
       volume = {
         name     = "geoserver_marineenvironmentalindicators_data_volume",