diff --git a/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationLegacy.java b/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationLegacy.java
index 44eaaca..c9ba0ee 100644
--- a/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationLegacy.java
+++ b/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationLegacy.java
@@ -32,8 +32,8 @@ public class RegistrationLegacy extends AbstractRegistration {
     public RegistrationLegacy(final String tenantId, final HttpUrl deviceRegistryUrl) {
         super(tenantId);
 
-        this.registrationUrl = deviceRegistryUrl.resolve("/registration/");
-        this.credentialsUrl = deviceRegistryUrl.resolve("/credentials/");
+        this.registrationUrl = deviceRegistryUrl.resolve("registration/");
+        this.credentialsUrl = deviceRegistryUrl.resolve("credentials/");
     }
 
     @Override
diff --git a/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationV1.java b/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationV1.java
index bb91b00..ab46e29 100644
--- a/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationV1.java
+++ b/simulator-common/src/main/java/de/dentrassi/hono/demo/common/RegistrationV1.java
@@ -35,8 +35,14 @@ public class RegistrationV1 extends AbstractRegistration {
     public RegistrationV1(final String tenantId, final HttpUrl deviceRegistryUrl) {
         super(tenantId);
 
-        this.registrationUrl = deviceRegistryUrl.resolve("/devices/");
-        this.credentialsUrl = deviceRegistryUrl.resolve("/credentials/");
+        this.registrationUrl = deviceRegistryUrl
+                .newBuilder()
+                .addPathSegment("devices")
+                .build();
+        this.credentialsUrl = deviceRegistryUrl
+                .newBuilder()
+                .addPathSegment("credentials")
+                .build();
     }
 
     @Override
@@ -53,8 +59,10 @@ public void device(final String deviceId, final String username,
         try (final Response getDevice = this.http.newCall(new Request.Builder()
                 .url(
                         this.registrationUrl
-                                .resolve(this.tenantId + "/")
-                                .resolve(deviceId))
+                                .newBuilder()
+                                .addPathSegment(this.tenantId)
+                                .addPathSegment(deviceId)
+                                .build())
                 .get()
                 .build()).execute()) {
 
@@ -71,8 +79,10 @@ public void device(final String deviceId, final String username,
                 try (final Response newDevice = this.http.newCall(new Request.Builder()
                         .url(
                                 this.registrationUrl
-                                        .resolve(this.tenantId + "/")
-                                        .resolve(deviceId))
+                                        .newBuilder()
+                                        .addPathSegment(this.tenantId)
+                                        .addPathSegment(deviceId)
+                                        .build())
                         .post(RequestBody.create(MT_JSON, "{}" /* empty object */))
                         .build()).execute()) {
 
@@ -96,8 +106,10 @@ public void device(final String deviceId, final String username,
         try (Response putCredentials = this.http.newCall(new Request.Builder()
                 .url(
                         this.credentialsUrl
-                                .resolve(this.tenantId + "/")
-                                .resolve(deviceId))
+                                .newBuilder()
+                                .addPathSegment(this.tenantId)
+                                .addPathSegment(deviceId)
+                                .build())
                 .put(RequestBody.create(MT_JSON, encode(new CommonCredential[] { pc })))
                 .build())
                 .execute()) {