diff --git a/Dockerfile b/Dockerfile
index 88f4dca..fac2379 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -165,7 +165,7 @@ RUN useradd --create-home --shell /bin/bash pyros_user --uid $uid
 
 # Create the work dir and set permissions as pyros_user 
 RUN mkdir -p /home/pyros_user/app/ && chown -R pyros_user:pyros_user /home/pyros_user/app
-WORKDIR /home/pyros_user/app
+WORKDIR /home/pyros_user/app/pyros
 
 # Switch from root to pyros_user
 USER pyros_user
@@ -177,7 +177,7 @@ USER pyros_user
 
 
 # Copy local host machine files to image
-COPY --chown=pyros_user:pyros_user . .
+COPY --chown=pyros_user:pyros_user .. .
 # Copy some aliases
 RUN cp .bash_aliases ..
 #RUN mv .bash_aliases ..
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d01134a..2629804 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -96,7 +96,7 @@ services:
     # stdin_open is the -i option in docker exec
     stdin_open: true
     volumes:
-      - ..:/home/pyros_user/app
+      - ../..:/home/pyros_user/app
     # tells which port of local machine can communicate with the docker image (host:container), host is your local machine
     ports:
       - "${PYROS_WEBSITE_PORT:-8000}:${PYROS_WEBSITE_PORT:-8000}"
--
libgit2 0.21.2