diff --git a/roles/yubikey/templates/ykksm-config.php b/roles/yubikey/templates/ykksm-config.php
index 749b0ff086..540e7d16bf 100644
--- a/roles/yubikey/templates/ykksm-config.php
+++ b/roles/yubikey/templates/ykksm-config.php
@@ -1,9 +1,5 @@
 <?php
-{% if env == 'staging' %}
-$db_dsn      = "pgsql:dbname=ykksm;host=db-fas01.stg";
-{% else %}
-$db_dsn      = "pgsql:dbname=ykksm;host=db-ykksm";
-{% endif %}
+$db_dsn      = "pgsql:dbname=ykksm;host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org";
 $db_username = "ykksmreader";
 $db_password = "{{ ykksmreaderPassword }}";
 $db_options  = array();
diff --git a/roles/yubikey/templates/ykval-config.php b/roles/yubikey/templates/ykval-config.php
index 8e2a51e1a1..27d23ce1b3 100644
--- a/roles/yubikey/templates/ykval-config.php
+++ b/roles/yubikey/templates/ykval-config.php
@@ -2,11 +2,7 @@
 
 # For the validation interface.
 $baseParams = array ();
-{% if env == "staging" %}
-$baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-fas01.stg";
-{% else %}
-$baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-ykval";
-{% endif %}
+$baseParams['__YKVAL_DB_DSN__'] = "pgsql:dbname=ykval;host=db-fas01{{ env_suffix }}.phx2.fedoraproject.org";
 $baseParams['__YKVAL_DB_USER__'] = 'ykval_verifier';
 $baseParams['__YKVAL_DB_PW__'] = '{{ ykvalDBPassword }}';
 $baseParams['__YKVAL_DB_OPTIONS__'] = array();
@@ -47,7 +43,7 @@ function otp2ksmurls ($otp, $client) {
   }
 
   return array(
-	       "http://localhost/yk-ksm?otp=$otp",
+	       "http://localhost:8080/yk-ksm?otp=$otp",
 	       );
 }