diff --git a/openstack-tf/d4s-preprod/resource-registry/main.tf b/openstack-tf/d4s-preprod/resource-registry/main.tf
new file mode 100644
index 00000000..5e88e1e7
--- /dev/null
+++ b/openstack-tf/d4s-preprod/resource-registry/main.tf
@@ -0,0 +1,60 @@
+# Define required providers
+terraform {
+  required_version = ">= 0.14.0"
+  required_providers {
+    openstack = {
+      source  = "terraform-provider-openstack/openstack"
+      version = "~> 1.53.0"
+    }
+  }
+}
+
+data "terraform_remote_state" "privnet_dns_router" {
+  backend = "local"
+
+  config = {
+    path = "../project-setup/terraform.tfstate"
+  }
+}
+
+#
+# Uses common_variables as module
+#
+module "common_variables" {
+  source = "../../modules/common_variables"
+}
+
+#
+# Creates the server group "resource-registry"
+# Even in dev because this service is crucial the server group is
+# created with anti-affinity policy
+#
+resource "openstack_compute_servergroup_v2" "resource_registry_server_group" {
+  name     = "resource-registry"
+  policies = [module.common_variables.policy_list.soft_anti_affinity]
+}
+
+module "instance_without_data_volume" {
+  source = "../../modules/instance_without_data_volume"
+
+  instances_without_data_volume_map = {
+    resource_registry_1 = {
+      name              = "resource-registry-1",
+      description       = "This instance serves resource-registry service",
+      flavor            = module.common_variables.flavor_list.m1_medium,
+      networks          = ["d4s-pre-cloud-main", module.common_variables.networks_list.orientdb],
+      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.resource_registry_server_group.id],
+      image_ref         = module.common_variables.ubuntu_1804
+    },
+    resource_registry_2 = {
+      name              = "resource-registry-2",
+      description       = "This instance serves resource-registry service",
+      flavor            = module.common_variables.flavor_list.m1_medium,
+      networks          = ["d4s-pre-cloud-main", module.common_variables.networks_list.orientdb],
+      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.resource_registry_server_group.id],
+      image_ref         = module.common_variables.ubuntu_1804
+    }
+  }
+}
diff --git a/openstack-tf/d4s-preprod/resource-registry/provider.tf b/openstack-tf/d4s-preprod/resource-registry/provider.tf
new file mode 100644
index 00000000..5c9deb71
--- /dev/null
+++ b/openstack-tf/d4s-preprod/resource-registry/provider.tf
@@ -0,0 +1,3 @@
+provider "openstack" {
+  cloud = "d4s-pre"
+}
diff --git a/openstack-tf/d4s-production/resource-registry/main.tf b/openstack-tf/d4s-production/resource-registry/main.tf
new file mode 100644
index 00000000..be8f354c
--- /dev/null
+++ b/openstack-tf/d4s-production/resource-registry/main.tf
@@ -0,0 +1,60 @@
+# Define required providers
+terraform {
+  required_version = ">= 0.14.0"
+  required_providers {
+    openstack = {
+      source  = "terraform-provider-openstack/openstack"
+      version = "~> 1.53.0"
+    }
+  }
+}
+
+data "terraform_remote_state" "privnet_dns_router" {
+  backend = "local"
+
+  config = {
+    path = "../project-setup/terraform.tfstate"
+  }
+}
+
+#
+# Uses common_variables as module
+#
+module "common_variables" {
+  source = "../../modules/common_variables"
+}
+
+#
+# Creates the server group "resource-registry"
+# Even in dev because this service is crucial the server group is
+# created with anti-affinity policy
+#
+resource "openstack_compute_servergroup_v2" "resource_registry_server_group" {
+  name     = "resource-registry"
+  policies = [module.common_variables.policy_list.anti_affinity]
+}
+
+module "instance_without_data_volume" {
+  source = "../../modules/instance_without_data_volume"
+
+  instances_without_data_volume_map = {
+    resource_registry_1 = {
+      name              = "resource-registry-1",
+      description       = "This instance serves resource-registry service",
+      flavor            = module.common_variables.flavor_list.m1_large,
+      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.orientdb],
+      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.resource_registry_server_group.id],
+      image_ref         = module.common_variables.ubuntu_1804
+    },
+    resource_registry_2 = {
+      name              = "resource-registry-2",
+      description       = "This instance serves resource-registry service",
+      flavor            = module.common_variables.flavor_list.m1_large,
+      networks          = ["d4s-production-cloud-main", module.common_variables.networks_list.orientdb],
+      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.resource_registry_server_group.id],
+      image_ref         = module.common_variables.ubuntu_1804
+    }
+  }
+}
diff --git a/openstack-tf/d4s-production/resource-registry/provider.tf b/openstack-tf/d4s-production/resource-registry/provider.tf
new file mode 100644
index 00000000..ca8de747
--- /dev/null
+++ b/openstack-tf/d4s-production/resource-registry/provider.tf
@@ -0,0 +1,3 @@
+provider "openstack" {
+  cloud = "d4s-production"
+}