diff --git a/backend/.flaskenv b/backend/.flaskenv
index 3e15686..ad43430 100644
--- a/backend/.flaskenv
+++ b/backend/.flaskenv
@@ -1,2 +1,2 @@
-FLASK_APP=src/api.py
+FLASK_APP=src/app.py
 FLASK_ENV=development
diff --git a/backend/Dockerfile b/backend/Dockerfile
index b70590e..6dfe114 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,18 +1,19 @@
-FROM python:latest
+# For more information, please refer to https://aka.ms/vscode-docker-python
+FROM python:3.9
 
-# set working directory
-WORKDIR /code
-
-# install app dependencies
-COPY requirements.txt .
-
-RUN pip install -r requirements.txt
-
-# add app
-COPY src/ .
-
-# Expose Port 5000
 EXPOSE 5000
 
-# start app
+# Keeps Python from generating .pyc files in the container
+ENV PYTHONDONTWRITEBYTECODE 1
+
+# Turns off buffering for easier container logging
+ENV PYTHONUNBUFFERED 1
+
+# Install pip requirements
+ADD requirements.txt .
+RUN python -m pip install -r requirements.txt
+                                                                                   
+WORKDIR /app
+ADD . /app
+
 CMD ["flask", "run"]
diff --git a/frontend/docker-compose.prod.yml b/docker-compose.prod.yml
similarity index 100%
rename from frontend/docker-compose.prod.yml
rename to docker-compose.prod.yml
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..8625cfc
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,30 @@
+version: '3.7'
+
+services:
+  frontend-dev:
+    container_name: hello_world_client
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    tty: true
+    volumes:
+      - './frontend/.:/app:z'
+      - '/app/node_modules'
+    ports:
+      - 3000:3000
+    environment:
+      - CHOKIDAR_USEPOLLING=true
+  backend-dev:
+    container_name: backend_bt
+    build: 
+      context: ./backend
+      dockerfile: Dockerfile
+    tty: true
+    volumes:
+      - ./backend:/usr/src/app/
+    ports:
+      - 5000:5000
+    environment:
+      PORT: 5000
+      FLASK_DEBUG: 1
+
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
deleted file mode 100644
index 4b51888..0000000
--- a/frontend/docker-compose.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3.7'
-
-services:
-  hello-dev:
-    container_name: hello_world_client
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - '.:/app:z'
-      - '/app/node_modules'
-    ports:
-      - 3000:3000
-    environment:
-      - CHOKIDAR_USEPOLLING=true
diff --git a/start.sh b/start.sh
new file mode 100644
index 0000000..5b7b88e
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,3 @@
+cd frontend
+podman-compose down 
+podman-compose up