diff --git a/wcsinst/wcsinstd/deploy.py b/wcsinst/wcsinstd/deploy.py
index 30213db..fd71a8c 100644
--- a/wcsinst/wcsinstd/deploy.py
+++ b/wcsinst/wcsinstd/deploy.py
@@ -88,9 +88,9 @@ class DeployInstance(object):
         database_name = wcs_cfg['postgresql'].get('database', 'wcs')
         domain_table_name = self.domain.replace('-', '_').replace('.', '_')
         if '_' in database_name:
-            database_name = '%s_%s' % (database_name.split('_')[0], domain_table)
+            database_name = '%s_%s' % (database_name.split('_')[0], domain_table_name)
         else:
-            database_name = '%s_%s' % (database_name, domain_table)
+            database_name = '%s_%s' % (database_name, domain_table_name)
 
         try:
             pgconn = psycopg2.connect(**wcs_cfg['postgresql'])