diff --git a/ykval-munin-yubikeystats.php b/ykval-munin-yubikeystats.php
index df878c7..35c1cad 100755
--- a/ykval-munin-yubikeystats.php
+++ b/ykval-munin-yubikeystats.php
@@ -37,11 +37,7 @@ if ($argc==2 && strcmp($argv[1], "config") == 0) {
 }
 
 # Connect to db
-$db = new Db($baseParams['__YKVAL_DB_DSN__'],
-	     $baseParams['__YKVAL_DB_USER__'],
-	     $baseParams['__YKVAL_DB_PW__'],
-	     $baseParams['__YKVAL_DB_OPTIONS__'],
-	     'ykval-munin-yubikeystats:db');
+$db = Db::GetDatabaseHandle($baseParams, 'ykval-munin-yubikeystats');
 if (!$db->connect()) {
   logdie($myLog, 'ERROR Database connect error (1)');
 }
diff --git a/ykval-resync.php b/ykval-resync.php
index edb38de..ece4547 100644
--- a/ykval-resync.php
+++ b/ykval-resync.php
@@ -25,11 +25,7 @@ if (!preg_match("/^([cbdefghijklnrtuv]{0,16})$/", $yk)) {
 $myLog->addField('yk', $yk);
 
 # Connect to db
-$db = new Db($baseParams['__YKVAL_DB_DSN__'],
-	     $baseParams['__YKVAL_DB_USER__'],
-	     $baseParams['__YKVAL_DB_PW__'],
-	     $baseParams['__YKVAL_DB_OPTIONS__'],
-	     'ykval-resync:db');
+$db = Db::GetDatabaseHandle($baseParams, 'ykval-resync');
 if (!$db->connect()) {
   logdie($myLog, 'ERROR Database connect error (1)');
 }