diff --git a/README.md b/README.md
index 250208fe..4816adc3 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.arangodb/arangodb-spring-data/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.arangodb/arangodb-spring-data)
 [![CircleCI](https://dl.circleci.com/status-badge/img/gh/arangodb/spring-data/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/arangodb/spring-data/tree/main)
 
-- [Reference](https://www.arangodb.com/docs/stable/drivers/spring-data-reference.html)
-- [Tutorial](https://university.arangodb.com/courses/spring-data-tutorial)
-- [Migration](https://www.arangodb.com/docs/stable/drivers/spring-data-migration.html)
+- [Reference & Tutorial](https://docs.arangodb.com/stable/develop/integrations/spring-data-arangodb/)
+- [Migration](https://docs.arangodb.com/stable/develop/integrations/spring-data-arangodb/migration/)
 
 ## Learn more
 
-- [ArangoDB](https://www.arangodb.com/)
-- [Demo](https://github.com/arangodb/spring-data-demo)
+- [ArangoDB](https://arangodb.com/)
+- [Demo without Spring Boot Starter](https://github.com/arangodb/spring-data/tree/main/tutorial/src/main/java/com/arangodb/spring/demo)
+- [Demo with Spring Boot Starter](https://github.com/arangodb/spring-boot-starter/tree/main/demo)
 - [Changelog](ChangeLog.md)
-- [JavaDoc](https://www.javadoc.io/doc/com.arangodb/arangodb-spring-data/latest)
+- [JavaDoc](https://www.javadoc.io/doc/com.arangodb/arangodb-spring-data/latest/index.html)