diff --git a/spring-security-kerberos-docs/modules/ROOT/pages/samples.adoc b/spring-security-kerberos-docs/modules/ROOT/pages/samples.adoc
index 7b2123a..ea3bf85 100644
--- a/spring-security-kerberos-docs/modules/ROOT/pages/samples.adoc
+++ b/spring-security-kerberos-docs/modules/ROOT/pages/samples.adoc
@@ -66,8 +66,8 @@ You may need to use custom kerberos config with Linux either by using
 
 [NOTE]
 ====
-See <<setupwinkerberos>> for more instructions how to work with
-windows kerberos environment.
+See xref:appendix.adoc#setupwinkerberos[Setup Windows Domain Controller]
+for more instructions how to work with windows kerberos environment.
 ====
 
 Login to `Windows 8.1` using domain credentials and access sample
@@ -107,8 +107,8 @@ This sample demonstrates how a server can be configured to accept a
 Spnego based negotiation from a browser while still being able to fall
 back to a form based authentication.
 
-Using a `user1` principal <<setupmitkerberos>>, do a kerberos login
-manually using credentials.
+Using a `user1` principal xref:appendix.adoc#setupmitkerberos[Setup MIT Kerberos],
+do a kerberos login manually using credentials.
 [source,text]
 ----
 $ kinit user1
@@ -149,8 +149,8 @@ authentication with existing ticket.
 
 [NOTE]
 ====
-See <<browserspnegoconfig>> for more instructions for configuring
-browsers to use Spnego.
+See xref:appendix.adoc#browserspnegoconfig[Configure Browsers for Spnego Negotiation]
+for more instructions for configuring browsers to use Spnego.
 ====
 
 [source,yaml,indent=0]
@@ -189,8 +189,8 @@ app:
 ----
 
 
-Using a `user1` principal <<setupmitkerberos>>, do a kerberos login
-manually using credentials.
+Using a `user1` principal xref:appendix.adoc#setupmitkerberos[Setup MIT Kerberos],
+do a kerberos login manually using credentials.
 [source,text,subs="attributes"]
 ----
 $ java -jar sec-client-rest-template-{version}.jar --app.user-principal --app.keytab-location
diff --git a/spring-security-kerberos-docs/modules/ROOT/pages/ssk.adoc b/spring-security-kerberos-docs/modules/ROOT/pages/ssk.adoc
index c505544..a720121 100644
--- a/spring-security-kerberos-docs/modules/ROOT/pages/ssk.adoc
+++ b/spring-security-kerberos-docs/modules/ROOT/pages/ssk.adoc
@@ -93,6 +93,6 @@ include::example$KerberosLdapContextSourceConfig.java[tags=snippetA]
 
 [TIP]
 ====
-Sample <<samples-sec-server-win-auth>> is currently configured to
-query user details from AD if authentication happen via kerberos.
+Sample xref:samples.adoc#samples-sec-server-win-auth[Security Server Windows Auth Sample]
+is currently configured to query user details from AD if authentication happen via kerberos.
 ====