diff --git a/Dockerfile b/Dockerfile
index 341df63f..b2f86b7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:14.16.0 as frontend
 
-LABEL org.opencontainers.image.source https://github.com/mCaptcha/guard
+LABEL org.opencontainers.image.source https://github.com/mCaptcha/mCaptcha
 
 WORKDIR /src
 COPY package.json yarn.lock ./
@@ -14,9 +14,9 @@ WORKDIR /src
 RUN cargo build --release 
 
 FROM debian:buster
-RUN useradd -ms /bin/bash -u 1001 guard
-WORKDIR /home/guard
-COPY --from=rust /src/target/release/guard /usr/local/bin/
-COPY --from=rust /src/config/default.toml /etc/guard/config.toml
-USER guard
-CMD [ "/usr/local/bin/guard" ]
+RUN useradd -ms /bin/bash -u 1001 mcaptcha
+WORKDIR /home/mcaptcha
+COPY --from=rust /src/target/release/mcaptcha /usr/local/bin/
+COPY --from=rust /src/config/default.toml /etc/mcaptcha/config.toml
+USER mcaptcha
+CMD [ "/usr/local/bin/mcaptcha" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 9d230a59..35c9924c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 
 services:
-  guard:
+  mcaptcha:
     build: .
     ports:
       - 7000:7000
@@ -12,10 +12,10 @@ services:
   postgres:
     image: postgres:13.2
     volumes:
-      - mcaptcha-guard-data:/var/lib/postgresql/
+      - mcaptcha-data:/var/lib/postgresql/
     environment:
       POSTGRES_PASSWORD: # enter password
-      PGDATA: /var/lib/postgresql/data/guard/
+      PGDATA: /var/lib/postgresql/data/mcaptcha/
 
 volumes:
-  mcaptcha-guard-data:
+  mcaptcha-data: