diff --git a/openstack-tf/d4s-production/geoserver/main.tf b/openstack-tf/d4s-production/geoserver/main.tf
index 17792670..11f946b7 100644
--- a/openstack-tf/d4s-production/geoserver/main.tf
+++ b/openstack-tf/d4s-production/geoserver/main.tf
@@ -185,3 +185,106 @@ module "instance_with_data_volume" {
     }
   }
 }
+
+
+locals {
+  cname_target = "main-lb.${data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name}"
+}
+
+#
+# Add DNS record/s
+#
+module "dns_records_create" {
+  source = "../../modules/dns_resources"
+
+  dns_resources_map = {
+    geoserver-geona = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-geona", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-geona"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-esquiline = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-esquiline", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-esquiline"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-ariadne = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-ariadne", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-ariadne"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-grsf = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-grsf", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-grsf"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-protectedareaimpactmaps = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-protectedareaimpactmaps", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-protectedareaimpactmaps"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-sdilab = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-sdilab", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-sdilab"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-tunaatlas = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-tunaatlas", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-tunaatlas"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-wecafcfirms = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-wecafcfirms", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-wecafcfirms"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-aquacultureatlas = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-aquacultureatlas", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-aquacultureatlas"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-globalfisheriesatlas = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-globalfisheriesatlas", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geonetwork geoserver-globalfisheriesatlas"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    },
+    geoserver-marineenvironmentalindicators = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoserver-marineenvironmentalindicators", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoserver geoserver-marineenvironmentalindicators"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    }
+  }
+}