diff --git a/templates/devportal-postgres.conf.j2 b/templates/devportal-postgres.conf.j2
index 42f3928..b0833b7 100644
--- a/templates/devportal-postgres.conf.j2
+++ b/templates/devportal-postgres.conf.j2
@@ -1,12 +1,5 @@
 HOSTIP="$(hostname -i)"
 MP_POD={{ opdk_mp_pod | default(default_mp_pod) }}
-{# TODO: Build a module that discover the region of the inventory_hostname and update the REGION dynamically #}
-{% if groups['dc-1'] is defined and inventory_hostname in groups['dc-1'] %}
-REGION=dc-1
-{% elif groups['dc-2'] is defined and inventory_hostname in groups['dc-2'] %}
-REGION=dc-2
-{% elif groups['dc-3'] is defined and inventory_hostname in groups['dc-3'] %}
-REGION=dc-3
-{% endif %}
-PG_PWD={{ devportal_pg_pass | default(pg_pass) }}
+REGION={{ region }}
+PG_PWD='{{ devportal_pg_pass | default(pg_pass) }}'