diff --git a/.env-sail b/.env-sail
index 217499863..a623e02dc 100644
--- a/.env-sail
+++ b/.env-sail
@@ -1,4 +1,4 @@
-APP_NAME=OC
+APP_NAME=oc
 APP_ENV=local
 INSTALLED="false"
 APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX
diff --git a/docker-compose.yml b/docker-compose.yml
index a28ceb271..7d2d57604 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: ${APP_NAME}_php
+    container_name: oc_php
     environment:
       - CONTAINER_ROLE=app
     volumes:
@@ -45,7 +45,7 @@ services:
   # Database Server
   database:
     image: mysql:8.0
-    container_name: database
+    container_name: ${APP_NAME}_database
     ports:
         -   3306:3306
     command: --max_allowed_packet=32505856      # Set max_allowed_packet to 256M (or any other value)