diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 248a337bb83..4861ab140c5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -33,8 +33,8 @@ jobs:
 
       - name: Building the Docker image
         run: |
-          source docker/compose.env
-          source docker/build.sh
+          source build/docker/compose.env
+          source build/docker/build.sh
           echo "OPENBBTERMINAL_DOCKER_POETRY_IMAGE=$OPENBBTERMINAL_DOCKER_POETRY_IMAGE" >> $GITHUB_ENV
           
       - name: Publishing the Docker image
diff --git a/.gitignore b/.gitignore
index 48fce6544b3..6deb07cb823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ openbb_terminal/reports/templates/*.html
 website/functions
 *_sdk_audit.csv
 website/terminaltest
+!build/docker/compose.env
 
 # pyinstaller artifacts
 *.pyo
diff --git a/docker/README.md b/build/docker/README.md
similarity index 100%
rename from docker/README.md
rename to build/docker/README.md
diff --git a/docker/build.sh b/build/docker/build.sh
similarity index 100%
rename from docker/build.sh
rename to build/docker/build.sh
diff --git a/docker/compose.env b/build/docker/compose.env
similarity index 100%
rename from docker/compose.env
rename to build/docker/compose.env
diff --git a/docker/docker-compose.yaml b/build/docker/docker-compose.yaml
similarity index 54%
rename from docker/docker-compose.yaml
rename to build/docker/docker-compose.yaml
index 7e5b25adc08..b731afc03ef 100644
--- a/docker/docker-compose.yaml
+++ b/build/docker/docker-compose.yaml
@@ -4,9 +4,9 @@ services:
     environment:
         DISPLAY: host.docker.internal:0.0
     volumes:
-      - ~/OpenBBUserData:/home/python/OpenBBUserData
-      - ~/.openbb_terminal:/home/python/.openbb_terminal
+      - ~/OpenBBUserData:/root/OpenBBUserData
+      - ~/.openbb_terminal:/root/.openbb_terminal
     platform: linux/amd64
-    image: ghcr.io/openbb-finance/openbbterminal/poetry:1.9.1
+    image: ghcr.io/openbb-finance/openbbterminal/poetry:2.0.0rc1
     stdin_open: true # docker run -i
     tty: true        # docker run -t
\ No newline at end of file
diff --git a/docker/poetry.dockerfile b/build/docker/poetry.dockerfile
similarity index 100%
rename from docker/poetry.dockerfile
rename to build/docker/poetry.dockerfile
diff --git a/openbb_terminal/DOCKER_README.md b/openbb_terminal/DOCKER_README.md
index 71a61d0cd44..178a8c66643 100644
--- a/openbb_terminal/DOCKER_README.md
+++ b/openbb_terminal/DOCKER_README.md
@@ -87,7 +87,7 @@ Here is the commands to run:
 ```bash
 docker pull ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
 
-docker run -v ~/.openbb_terminal/:/home/python/.openbb_terminal -v ~/OpenBBUserData:/home/python/OpenBBUserData -it --rm ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
+docker run -v ~/.openbb_terminal/:/root/.openbb_terminal -v ~/OpenBBUserData:/root/OpenBBUserData -it --rm ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
 ```
 
 Be sure to replace `X.Y.Z` with the version you want to pull and run.
@@ -122,7 +122,7 @@ docker compose run poetry
 Or run `Docker` directly:
 
 ```bash
-docker run -v ~/.openbb_terminal:/home/python/.openbb_terminal -v ~/OpenBBUserData:/home/python/OpenBBUserData -it --rm --env DISPLAY=host.docker.internal:0.0 ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
+docker run -v ~/.openbb_terminal:/root/.openbb_terminal -v ~/OpenBBUserData:/root/OpenBBUserData -it --rm --env DISPLAY=host.docker.internal:0.0 ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
 ```
 
 ### X-Server on macOS
@@ -151,7 +151,7 @@ xhost + $IP
 Now we can run the docker container, adding the display to the environment:
 
 ```bash
-docker run -v ~/.openbb_terminal/:/home/python/.openbb_terminal -v ~/OpenBBUserData:/home/python/OpenBBUserData -it --rm --env-file=path/to/setenv --env DISPLAY=$IP:0 ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
+docker run -v ~/.openbb_terminal/:/root/.openbb_terminal -v ~/OpenBBUserData:/root/OpenBBUserData -it --rm --env-file=path/to/setenv --env DISPLAY=$IP:0 ghcr.io/openbb-finance/openbbterminal-poetry:X.Y.Z
 ```
 
 This container will be able to display all the same plots as the terminal interface.