diff --git a/README.md b/README.md
index c865c3b51..3d1d528d9 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ java -jar target/*.jar
 
 (On Windows, or if your shell doesn't expand the glob, you might need to specify the JAR file name explicitly on the command line at the end there.)
 
-You can then access the Petclinic at <http://localhost:8080/>.
+You can then access the Petclinic at <http://localhost:8090/>.
 
 <img width="1042" alt="petclinic-screenshot" src="https://cloud.githubusercontent.com/assets/838318/19727082/2aee6d6c-9b8e-11e6-81fe-e889a5ddfded.png">
 
@@ -46,7 +46,7 @@ Our issue tracker is available [here](https://github.com/spring-projects/spring-
 ## Database configuration
 
 In its default configuration, Petclinic uses an in-memory database (H2) which
-gets populated at startup with data. The h2 console is exposed at `http://localhost:8080/h2-console`,
+gets populated at startup with data. The h2 console is exposed at `http://localhost:8090/h2-console`,
 and it is possible to inspect the content of the database using the `jdbc:h2:mem:<uuid>` URL. The UUID is printed at startup to the console.
 
 A similar setup is provided for MySQL and PostgreSQL if a persistent database configuration is needed. Note that whenever the database type changes, the app needs to run with a different profile: `spring.profiles.active=mysql` for MySQL or `spring.profiles.active=postgres` for PostgreSQL. See the [Spring Boot documentation](https://docs.spring.io/spring-boot/how-to/properties-and-configuration.html#howto.properties-and-configuration.set-active-spring-profiles) for more detail on how to set the active profile.
@@ -125,7 +125,7 @@ The following items should be installed in your system:
 
 1. Navigate to the Petclinic
 
-    Visit [http://localhost:8080](http://localhost:8080) in your browser.
+    Visit [http://localhost:8090](http://localhost:8090) in your browser.
 
 ## Looking for something in particular?
 
diff --git a/k8s/petclinic.yml b/k8s/petclinic.yml
index a5677cd06..823777583 100644
--- a/k8s/petclinic.yml
+++ b/k8s/petclinic.yml
@@ -7,7 +7,7 @@ spec:
   type: NodePort
   ports:
     - port: 80
-      targetPort: 8080
+      targetPort: 8090
   selector:
     app: petclinic
 
@@ -43,7 +43,7 @@ spec:
                 }
           ports:
             - name: http
-              containerPort: 8080
+              containerPort: 8090
           livenessProbe:
             httpGet:
               path: /livez
diff --git a/src/test/jmeter/petclinic_test_plan.jmx b/src/test/jmeter/petclinic_test_plan.jmx
index 89c7bf210..2d7a9a7ae 100644
--- a/src/test/jmeter/petclinic_test_plan.jmx
+++ b/src/test/jmeter/petclinic_test_plan.jmx
@@ -16,7 +16,7 @@
           </elementProp>
           <elementProp name="PETCLINIC_PORT" elementType="Argument">
             <stringProp name="Argument.name">PETCLINIC_PORT</stringProp>
-            <stringProp name="Argument.value">8080</stringProp>
+            <stringProp name="Argument.value">8090</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="CONTEXT_WEB" elementType="Argument">