diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..0302672
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.8"
+services:
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    ports:
+      - "3100:3100"
+    depends_on:
+      - backend
+  backend:
+    build:
+      context: ./backend
+      dockerfile: Dockerfile
+    ports:
+      - "5000:5000"
+    volumes:
+      # TODO: This will need to be configured, need to rebuild part of the program for that though
+      - /home/azpect:/media/vault
+    env_file:
+      # TODO: This will need to be configured to use GH secrets, ez though
+      - ./backend/.env
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 7cf305b..cf62084 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -11,7 +11,7 @@ COPY /package*.json ./
 RUN npm install
 
 # Copy the rest of the frontend code
-COPY / .
+COPY . .
 
 # Build the React app using Vite
 RUN npm run build