diff --git a/.gitignore b/.gitignore
index a76b6de4a008d55a2d491c7f5aaa994e36cfb078..6a72e614340944f47898294ba08a634f3db03f44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,9 +51,5 @@ package-lock.json
 *.jpg
 *.ico
 
-# Docker files
-Dockerfile*
-Dockerfile.*
-docker-compose.*
 # Configuration files
 config/*
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5e7308f4a21f5795d9a53d9c1e90e8aab24d68ed
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM nginx:1.19.2
+
+# copy the files builded with npm run build
+COPY build /var/www
+COPY nginx.conf /etc/nginx/nginx.conf
+
+EXPOSE 3040
+
+ENTRYPOINT ["nginx","-g","daemon off;"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
new file mode 100644
index 0000000000000000000000000000000000000000..64c933a5d11864d64ab63646c56187ee26566ea3
--- /dev/null
+++ b/docker-compose.dev.yml
@@ -0,0 +1,29 @@
+version: '3.7'
+services:
+  bodysch-backend-dev:
+    container_name: bodysch-backend-dev
+    image: registry.kszk.bme.hu/bodysch/backend:dev
+    restart: always
+    ports:
+      - '3030:8000'
+    links:
+      - bodysch-mongo-dev
+    env_file:
+      - .env
+    depends_on:
+      - bodysch-mongo-dev
+  bodysch-mongo-dev:
+    container_name: bodysch-mongo-dev
+    image: mongo
+    volumes:
+      - ./data:/data/db
+    expose:
+      - '27017'
+  bodysch-frontend-dev:
+    container_name: bodysch-frontend-dev
+    image: registry.kszk.bme.hu/bodysch/frontend:DEV
+    restart: always
+    ports:
+      - '3040:3040'
+    depends_on:
+      - bodysch-backend-dev