diff --git a/Server/.gitignore b/Server/.gitignore
index 51b2eb44c..b509f7595 100644
--- a/Server/.gitignore
+++ b/Server/.gitignore
@@ -2,5 +2,5 @@ node_modules
 .env
 *.log
 *.sh
-docker/mongo/mongo_data/*
-docker/redis/redis_data/*
\ No newline at end of file
+docker/mongo/data/*
+docker/redis/data/*
\ No newline at end of file
diff --git a/Server/docker/docker-compose.yaml b/Server/docker/docker-compose.yaml
new file mode 100644
index 000000000..ac882732e
--- /dev/null
+++ b/Server/docker/docker-compose.yaml
@@ -0,0 +1,15 @@
+version: '3'
+services:
+  server:
+    image: uptime_server:latest
+    ports:
+      - "5000:5000"
+    env_file:
+      - .env
+    depends_on:
+      - redis
+      - mongodb
+  redis:
+    image: uptime_redis
+  mongodb:
+    image: uptime_database_mongo
\ No newline at end of file
diff --git a/Server/docker/server/Dockerfile b/Server/docker/server/Dockerfile
new file mode 100644
index 000000000..611a325a5
--- /dev/null
+++ b/Server/docker/server/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /app
+
+COPY ../../package*.json ./
+
+RUN npm install
+
+COPY ../../ ./
+
+EXPOSE 5000
+
+CMD ["node", "index.js"]
\ No newline at end of file