diff --git a/docs/guides/attributes.adoc b/docs/guides/attributes.adoc
index b3291dbbf5..ff8e4155fa 100644
--- a/docs/guides/attributes.adoc
+++ b/docs/guides/attributes.adoc
@@ -7,3 +7,4 @@
 :infinispan-operator-docs: https://infinispan.org/docs/infinispan-operator/main/operator.html
 :infinispan-xsite-docs: https://infinispan.org/docs/stable/titles/xsite/xsite.html
 :containerlabel: latest
+:apidocs_adminrest_link: https://www.keycloak.org/docs-api/{version}/rest-api/
diff --git a/docs/guides/operator/advanced-configuration.adoc b/docs/guides/operator/advanced-configuration.adoc
index 8aea9c296c..1ad0091fe4 100644
--- a/docs/guides/operator/advanced-configuration.adoc
+++ b/docs/guides/operator/advanced-configuration.adoc
@@ -203,7 +203,6 @@ spec:
 Moreover, the {project_name} container manages the heap size more effectively by providing relative values for the heap size.
 It is achieved by providing certain JVM options.
 
-For more details, check the
-https://www.keycloak.org/server/containers[Running Keycloak in a container].
+For more details, see <@links.server id="containers" />.
 
 </@tmpl.guide>
diff --git a/docs/guides/operator/basic-deployment.adoc b/docs/guides/operator/basic-deployment.adoc
index 7a846826b7..0b62ea552e 100644
--- a/docs/guides/operator/basic-deployment.adoc
+++ b/docs/guides/operator/basic-deployment.adoc
@@ -52,11 +52,13 @@ spec:
     spec:
       containers:
         - name: postgresql-db
-          image: postgres:latest
+          image: postgres:15
           volumeMounts:
             - mountPath: /data
               name: cache-volume
           env:
+            - name: POSTGRES_USER
+              value: testuser
             - name: POSTGRES_PASSWORD
               value: testpassword
             - name: PGDATA
diff --git a/docs/guides/operator/realm-import.adoc b/docs/guides/operator/realm-import.adoc
index f21a1693d7..5ce4bcee2f 100644
--- a/docs/guides/operator/realm-import.adoc
+++ b/docs/guides/operator/realm-import.adoc
@@ -36,7 +36,7 @@ spec:
 ----
 
 This CR should be created in the same namespace as the Keycloak Deployment CR, defined in the field `keycloakCRName`.
-The `realm` field accepts a full https://www.keycloak.org/docs-api/{version}/rest-api/index.html#RealmRepresentation[RealmRepresentation].
+The `realm` field accepts a full {apidocs_adminrest_link}/index.html#RealmRepresentation[RealmRepresentation].
 
 The recommended way to obtain a `RealmRepresentation` is by leveraging the export functionality <@links.server id="importExport"/>.