diff --git a/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/README.md b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/README.md
index 25990925..ec55774f 100644
--- a/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/README.md
+++ b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/README.md
@@ -2,7 +2,7 @@
 
 Spring Petclinic Microservices is a Java microservice application that simulates a pet clinic management system.
 
-![Spring Petclinic Microservices](docs/media/spring-petclinic-overview.png)
+![Spring Petclinic Microservices](docs/spring-petclinic-overview.png)
 
 The application allows users to manage information about pets, their owners, and visits to the clinic. It is built using Spring Boot and follows a microservices architecture.
 
diff --git a/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/docs/spring-petclinic-overview.png b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/docs/spring-petclinic-overview.png
new file mode 100644
index 00000000..fa146a45
Binary files /dev/null and b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/docs/spring-petclinic-overview.png differ
diff --git a/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
similarity index 100%
rename from scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
rename to scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/CustomersServiceApplication.java
diff --git a/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/customers/web/ResourceNotFoundException.java b/scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/ResourceNotFoundException.java
similarity index 100%
rename from scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-api-gateway/src/test/java/org/springframework/samples/petclinic/customers/web/ResourceNotFoundException.java
rename to scenarios/aca-internal/bicep/sample-apps/PCF-spring-boot/src/spring-petclinic-customers-service/src/main/java/org/springframework/samples/petclinic/customers/web/ResourceNotFoundException.java