diff --git a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java
index 28536265f..b206166e8 100644
--- a/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java
+++ b/history/taskana-simplehistory-rest-spring/src/main/java/pro/taskana/simplehistory/rest/resource/TaskHistoryEventListResourceAssembler.java
@@ -24,32 +24,32 @@ public class TaskHistoryEventListResourceAssembler extends AbstractRessourcesAss
     TaskHistoryEventListResource pagedResources =
         new TaskHistoryEventListResource(resources, pageMetadata);
 
-    pagedResources.add(new Link(this.getOriginal().toUriString()).withSelfRel());
+    pagedResources.add(Link.of(this.getOriginal().toUriString()).withSelfRel());
     if (pageMetadata != null) {
       pagedResources.add(linkTo(TaskHistoryEventController.class).withRel("allTaskHistoryEvent"));
       pagedResources.add(
-          new Link(this.getOriginal().replaceQueryParam("page", 1).toUriString())
+          Link.of(this.getOriginal().replaceQueryParam("page", 1).toUriString())
               .withRel(IanaLinkRelations.FIRST));
       pagedResources.add(
-          new Link(
-                  this.getOriginal()
-                      .replaceQueryParam("page", pageMetadata.getTotalPages())
-                      .toUriString())
+          Link.of(
+              this.getOriginal()
+                  .replaceQueryParam("page", pageMetadata.getTotalPages())
+                  .toUriString())
               .withRel(IanaLinkRelations.LAST));
       if (pageMetadata.getNumber() > 1) {
         pagedResources.add(
-            new Link(
-                    this.getOriginal()
-                        .replaceQueryParam("page", pageMetadata.getNumber() - 1)
-                        .toUriString())
+            Link.of(
+                this.getOriginal()
+                    .replaceQueryParam("page", pageMetadata.getNumber() - 1)
+                    .toUriString())
                 .withRel(IanaLinkRelations.PREV));
       }
       if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) {
         pagedResources.add(
-            new Link(
-                    this.getOriginal()
-                        .replaceQueryParam("page", pageMetadata.getNumber() + 1)
-                        .toUriString())
+            Link.of(
+                this.getOriginal()
+                    .replaceQueryParam("page", pageMetadata.getNumber() + 1)
+                    .toUriString())
                 .withRel(IanaLinkRelations.NEXT));
       }
     }
diff --git a/pom.xml b/pom.xml
index a7536a631..532d97929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <version.spring.boot>2.2.7.RELEASE</version.spring.boot>
         <version.spring.restdocs>2.0.4.RELEASE</version.spring.restdocs>
         <version.spring.mybatis>2.0.4</version.spring.mybatis>
-        <version.spring.hateos>1.0.5.RELEASE</version.spring.hateos>
+        <version.spring.hateos>1.1.0.RELEASE</version.spring.hateos>
         <version.spring.ldap>2.3.3.RELEASE</version.spring.ldap>
 
         <!-- wildfly dependencies -->
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
index e433fc8ee..f01ff3253 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/AbstractRessourcesAssembler.java
@@ -45,21 +45,21 @@ public abstract class AbstractRessourcesAssembler {
       PagedResources<?> pagedResources, PageMetadata pageMetadata) {
     UriComponentsBuilder original = getBuilderForOriginalUri();
     pagedResources.add(
-        (new Link(original.replaceQueryParam("page", 1).toUriString())).withRel("first"));
+        (Link.of(original.replaceQueryParam("page", 1).toUriString())).withRel("first"));
     pagedResources.add(
-        (new Link(original.replaceQueryParam("page", pageMetadata.getTotalPages()).toUriString()))
+        (Link.of(original.replaceQueryParam("page", pageMetadata.getTotalPages()).toUriString()))
             .withRel("last"));
     if (pageMetadata.getNumber() > 1L) {
       pagedResources.add(
-          (new Link(
+          (Link.of(
               original.replaceQueryParam("page", pageMetadata.getNumber() - 1L).toUriString()))
               .withRel("prev"));
     }
 
     if (pageMetadata.getNumber() < pageMetadata.getTotalPages()) {
       pagedResources.add(
-          (new Link(
-                  original.replaceQueryParam("page", pageMetadata.getNumber() + 1L).toUriString()))
+          (Link.of(
+              original.replaceQueryParam("page", pageMetadata.getNumber() + 1L).toUriString()))
               .withRel("next"));
     }
 
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/links/PageLinksAspect.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/links/PageLinksAspect.java
index b5ffa405a..e71763ecd 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/links/PageLinksAspect.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/links/PageLinksAspect.java
@@ -40,26 +40,26 @@ public class PageLinksAspect {
     RepresentationModel<T> resourceSupport = (RepresentationModel<T>) joinPoint.proceed();
     if (page != null) {
       resourceSupport.add(
-          new Link(original.replaceQueryParam("page", page.getNumber()).toUriString())
+           Link.of(original.replaceQueryParam("page", page.getNumber()).toUriString())
               .withSelfRel());
       resourceSupport.add(
-          new Link(original.replaceQueryParam("page", 1).toUriString())
+          Link.of(original.replaceQueryParam("page", 1).toUriString())
               .withRel(IanaLinkRelations.FIRST));
       resourceSupport.add(
-          new Link(original.replaceQueryParam("page", page.getTotalPages()).toUriString())
+          Link.of(original.replaceQueryParam("page", page.getTotalPages()).toUriString())
               .withRel(IanaLinkRelations.LAST));
       if (page.getNumber() > 1) {
         resourceSupport.add(
-            new Link(original.replaceQueryParam("page", page.getNumber() - 1).toUriString())
+            Link.of(original.replaceQueryParam("page", page.getNumber() - 1).toUriString())
                 .withRel(IanaLinkRelations.PREV));
       }
       if (page.getNumber() < page.getTotalPages()) {
         resourceSupport.add(
-            new Link(original.replaceQueryParam("page", page.getNumber() + 1).toUriString())
+            Link.of(original.replaceQueryParam("page", page.getNumber() + 1).toUriString())
                 .withRel(IanaLinkRelations.NEXT));
       }
     } else {
-      resourceSupport.add(new Link(original.toUriString()).withSelfRel());
+      resourceSupport.add(Link.of(original.toUriString()).withSelfRel());
     }
     return resourceSupport;
   }