diff --git a/docs/guides/getting-started-java-spring.md b/docs/guides/getting-started-java-spring.md
index f4ad27e549..753e0a86ef 100644
--- a/docs/guides/getting-started-java-spring.md
+++ b/docs/guides/getting-started-java-spring.md
@@ -81,7 +81,7 @@ To deploy your process, take the following steps:
 3. Change the **Cluster endpoint** to `http://localhost:26500/`, with no authentication.
 4. Click **Deploy**.
 
-When you open Operate at http://localhost:8081/, you should now note the process deployed to your local Self-Managed setup.
+When you open Operate at http://localhost:8080/operate/, you should now note the process deployed to your local Self-Managed setup.
 
 ## Step 5: Run your process from Modeler
 
@@ -119,7 +119,7 @@ See our documentation on [adding the Spring Zeebe SDK to your project](/apis-too
 </repositories>
 ```
 
-2. Add the following dependency to your `pom.xml` file:
+2. Add the following dependency your `pom.xml` file, as a child of the `<dependencies>` element:
 
 ```
 <dependency>
@@ -181,7 +181,24 @@ In your terminal, run `mvn spring-boot:run`, where you should see the `charging
 
 To start a process instance programmatically, take the following steps:
 
-1. In `ProcessPaymentsApplication.java`, convert the application to a `CommandLineRunner`, by adding `implements CommandLineRunner` to the `ProcessPaymentsApplication` class declaration. Instantiate a static `Logger` variable, and an instance variable named `zeebeClient` with the `@Autowired` annotation.
+1. In `ProcessPaymentsApplication.java`, add the following dependencies after the package definition:
+
+```java
+package io.camunda.demo.process_payments;
+
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import io.camunda.zeebe.client.ZeebeClient;
+import io.camunda.zeebe.spring.client.annotation.Deployment;
+```
+
+2. Convert the application to a `CommandLineRunner`, by adding `implements CommandLineRunner` to the `ProcessPaymentsApplication` class declaration. Instantiate a static `Logger` variable, and an instance variable named `zeebeClient` with the `@Autowired` annotation.
 
 ```java
 @SpringBootApplication
@@ -199,7 +216,7 @@ public class ProcessPaymentsApplication implements CommandLineRunner {
 }
 ```
 
-2. Implement an overriding `run` method in `ProcessPaymentsApplication`. When the application runs, it will create a new `process-payments` process instance, of the latest version, with specified variables, and send it to our local Self-Managed instance:
+3. Implement an overriding `run` method in `ProcessPaymentsApplication`. When the application runs, it will create a new `process-payments` process instance, of the latest version, with specified variables, and send it to our local Self-Managed instance:
 
 ```java
 	@Override
diff --git a/docs/guides/react-components/install-plain-java.md b/docs/guides/react-components/install-plain-java.md
index db97e716b8..a1dfab52e2 100644
--- a/docs/guides/react-components/install-plain-java.md
+++ b/docs/guides/react-components/install-plain-java.md
@@ -22,7 +22,7 @@ Confirm Elasticsearch is running by visiting `http://localhost:9200` in a browse
 
 ### Download and configure Camunda
 
-1. Download the [latest release artifact](https://github.com/camunda/camunda/releases) in the **Assets** section of the release page, starting with [8.6.0-alpha2](https://github.com/camunda/camunda/releases/tag/8.6.0-alpha2).
+1. Download and extract the [latest `camunda-zeebe-` release artifact](https://github.com/camunda/camunda/releases) in the **Assets** section of the release page, starting with [8.6.0-alpha2](https://github.com/camunda/camunda/releases/tag/8.6.0-alpha2).
 2. Navigate to the directory where you installed Camunda, and open `/config/application.yaml`. Add the following Elasticsearch exporter as a child of the `zeebe`/`broker` configuration element:
 
 ```
@@ -183,5 +183,5 @@ Save the file. Without performing this step, no data will be visible in Operate
 It may take a few minutes for startup to complete. When the message `Started StandaloneCamunda in ___ seconds` is displayed, the application is ready to use.
 
 :::tip
-Operate can be found at `http://localhost:8080/` and Tasklist can be found at `http://localhost:8080/tasklist`. Both use a default username/password of `demo`/`demo`.
+Operate can be found at `http://localhost:8080/operate` and Tasklist can be found at `http://localhost:8080/tasklist`. Both use a default username/password of `demo`/`demo`.
 :::
diff --git a/versioned_docs/version-8.5/guides/getting-started-java-spring.md b/versioned_docs/version-8.5/guides/getting-started-java-spring.md
index 19a5f89b19..63d6251b14 100644
--- a/versioned_docs/version-8.5/guides/getting-started-java-spring.md
+++ b/versioned_docs/version-8.5/guides/getting-started-java-spring.md
@@ -128,7 +128,7 @@ See our documentation on [adding the Spring Zeebe SDK to your project](/apis-too
 </repositories>
 ```
 
-2. Add the following dependency to your `pom.xml` file:
+2. Add the following dependency to your `pom.xml` file, as a child of the `<dependencies>` element:
 
 ```
 <dependency>
@@ -190,7 +190,24 @@ In your terminal, run `mvn spring-boot:run`, where you should see the `charging
 
 To start a process instance programmatically, take the following steps:
 
-1. In `ProcessPaymentsApplication.java`, convert the application to a `CommandLineRunner`, by adding `implements CommandLineRunner` to the `ProcessPaymentsApplication` class declaration. Instantiate a static `Logger` variable, and an instance variable named `zeebeClient` with the `@Autowired` annotation.
+1. In `ProcessPaymentsApplication.java`, add the following dependencies after the package definition:
+
+```java
+package io.camunda.demo.process_payments;
+
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import io.camunda.zeebe.client.ZeebeClient;
+import io.camunda.zeebe.spring.client.annotation.Deployment;
+```
+
+2. Convert the application to a `CommandLineRunner`, by adding `implements CommandLineRunner` to the `ProcessPaymentsApplication` class declaration. Instantiate a static `Logger` variable, and an instance variable named `zeebeClient` with the `@Autowired` annotation.
 
 ```java
 @SpringBootApplication
@@ -208,7 +225,7 @@ public class ProcessPaymentsApplication implements CommandLineRunner {
 }
 ```
 
-2. Implement an overriding `run` method in `ProcessPaymentsApplication`. When the application runs, it will create a new `process-payments` process instance, of the latest version, with specified variables, and send it to our local Self-Managed instance:
+3. Implement an overriding `run` method in `ProcessPaymentsApplication`. When the application runs, it will create a new `process-payments` process instance, of the latest version, with specified variables, and send it to our local Self-Managed instance:
 
 ```java
 	@Override