diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml
index 286a0ca..2040bf1 100644
--- a/docker-compose-debug.yml
+++ b/docker-compose-debug.yml
@@ -2,7 +2,7 @@
 version: "3.7"
 
 services:
-  util-bills-mongo:
+  mongo:
     image: mongo:4.4.27
     ulimits:
       nofile:
@@ -16,7 +16,7 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: example
     volumes:
       - ./mongo-volume:/data/db
-  util-bills-mongo-express:
+  mongo-express:
     image: mongo-express
     restart: always
     ports:
@@ -24,5 +24,5 @@ services:
     environment:
       ME_CONFIG_MONGODB_ADMINUSERNAME: root
       ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7
-      ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@util-bills-mongo:27017/
+      ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@mongo:27017/
 
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
index 01593ba..7ce634d 100644
--- a/docker-compose-deploy.yml
+++ b/docker-compose-deploy.yml
@@ -12,7 +12,7 @@ networks:
     internal: true
 
 services:
-  util-bills-app:
+  app:
     image: utility-bills-tracker:${IMAGE_VERSION}
     networks:
       - traefik-network
@@ -20,7 +20,7 @@ services:
     volumes:
       - ./etc/hosts/:/etc/hosts
     environment:
-      MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@util-bills-mongo:27017/utility-bills
+      MONGODB_URI: mongodb://rezije.app:w4z4piJBgCdAm4tpawqB@mongo:27017/utility-bills
       GOOGLE_ID: 355397364527-adjrokm6hromcaaar0qfhk050mfr35ou.apps.googleusercontent.com
       GOOGLE_SECRET: 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
       AUTH_SECRET: Gh0jQ35oq6DR8HkLR3heA8EaEDtxYN/xkP6blvukZ0w=
@@ -41,7 +41,7 @@ services:
         - traefik.http.services.web-app.loadbalancer.server.port=80
         - traefik.http.routers.web-app.entrypoints=http
         - traefik.http.routers.web-app.rule=Host(`${FQDN:-rezije.app}`)
-  util-bills-mongo:
+  mongo:
     image: mongo:4.4.27
     ulimits:
       nofile:
@@ -54,12 +54,12 @@ services:
       - ./mongo-volume:/data/db
     networks:
       - mongo-network
-  util-bills-mongo-express:
+  mongo-express:
     image: mongo-express
     environment:
       ME_CONFIG_MONGODB_ADMINUSERNAME: root
       ME_CONFIG_MONGODB_ADMINPASSWORD: HjktJCPWMBtM1ACrDaw7
-      ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@util-bills-mongo:27017/
+      ME_CONFIG_MONGODB_URL: mongodb://root:HjktJCPWMBtM1ACrDaw7@mongo:27017/
     networks:
       - traefik-network
       - mongo-network