diff --git a/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/github/Repository.scala b/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/github/Repository.scala
index 4a7f9644..56ae0da1 100644
--- a/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/github/Repository.scala
+++ b/sbt-github/src/main/scala/com/alejandrohdezma/sbt/github/github/Repository.scala
@@ -160,8 +160,8 @@ object Repository {
       startYear       <- json.get[ZonedDateTime]("created_at")
       contributors    <- json.get[String]("contributors_url")
       collaborators   <- json.get[String]("collaborators_url")
-      organizationUrl <- json.get[Option[OrganizationUrl]]("organization")
-      ownerUrl        <- json.get[OwnerUrl]("owner")
+      organizationUrl <- json.get[Option[String]]("organization", "url")
+      ownerUrl        <- json.get[String]("owner", "url")
     } yield Repository(
       name,
       description,
@@ -170,18 +170,8 @@ object Repository {
       startYear.getYear,
       contributors,
       collaborators.replace("{/collaborator}", ""),
-      organizationUrl.map(_.value),
-      ownerUrl.value
+      organizationUrl,
+      ownerUrl
     )
 
-  final private case class OrganizationUrl(value: String) extends AnyVal
-
-  implicit private val OrganizationUrlDecoder: Decoder[OrganizationUrl] =
-    _.get[String]("url").map(OrganizationUrl)
-
-  final private case class OwnerUrl(value: String) extends AnyVal
-
-  implicit private val OwnerUrlDecoder: Decoder[OwnerUrl] =
-    _.get[String]("url").map(OwnerUrl)
-
 }