diff --git a/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt b/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt
index a24e6afe4..2b22193f2 100644
--- a/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt
+++ b/waltid-wallet-api/src/main/kotlin/id/walt/webwallet/service/exchange/IssuanceService.kt
@@ -15,15 +15,12 @@ import id.walt.oid4vc.responses.TokenResponse
 import id.walt.oid4vc.util.randomUUID
 import id.walt.webwallet.manifest.extractor.EntraManifestExtractor
 import id.walt.webwallet.service.oidc4vc.TestCredentialWallet
-import io.ktor.client.*
+import id.walt.webwallet.utils.WalletHttpClients
 import io.ktor.client.call.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.serialization.kotlinx.json.*
 import io.ktor.util.*
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
@@ -32,12 +29,8 @@ import kotlinx.serialization.json.jsonPrimitive
 import org.slf4j.LoggerFactory
 
 object  IssuanceService {
-    private val http = HttpClient(CIO) {
-        install(ContentNegotiation) {
-            json()
-        }
-        followRedirects = false
-    }
+
+    private val http = WalletHttpClients.getHttpClient()
     private val logger = LoggerFactory.getLogger(this::class.java)
 
     suspend fun useOfferRequest(
diff --git a/waltid-wallet-api/src/test/kotlin/E2EWalletTestLocal.kt b/waltid-wallet-api/src/test/kotlin/E2EWalletTestLocal.kt
index fe2fd5e93..397db2449 100644
--- a/waltid-wallet-api/src/test/kotlin/E2EWalletTestLocal.kt
+++ b/waltid-wallet-api/src/test/kotlin/E2EWalletTestLocal.kt
@@ -194,7 +194,7 @@ class E2EWalletTestLocal : E2EWalletTestBase() {
 
         localWalletClient = newClient(token)
 
-        // list all wallets for this user
+        // list all wallets for this user - set wallet id
         listAllWalletsForUser()
 
         // list all Dids for this user and set default for credential issuance