diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 78adccec19e..107b6c2f597 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,6 +5,9 @@ on: workflow_dispatch
 jobs:
   publish-image:
     runs-on: ubuntu-latest
+    env: 
+      OWNER: openbb-finance
+      IMAGE: openbbterminal-poetry
 
     steps:
     - uses: actions/checkout@v2
@@ -20,6 +23,6 @@ jobs:
       run: |
         source docker/compose.env 
         docker-compose -f docker/docker-compose.yaml build
-        docker tag `docker images -q ghcr.io/openbb-finance/openbbterminal-poetry` ghcr.io/openbb-finance/openbbterminal-poetry:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
-        docker run ghcr.io/openbb-finance/openbbterminal-poetry:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
-        docker push ghcr.io/openbb-finance/openbbterminal-poetry:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
+        docker tag `docker images -q ghcr.io/$OWNER/$IMAGE` ghcr.io/$OWNER/$IMAGE:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
+        docker run ghcr.io/$OWNER/$IMAGE:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
+        docker push ghcr.io/$OWNER/$IMAGE:$OPENBBTERMINAL_DOCKER_POETRY_VERSION
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index cd431512a18..6b19f440d99 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -6,15 +6,6 @@ services:
       context: ..
       dockerfile: docker/openbbterminal-python.dockerfile
     image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-python:${OPENBBTERMINAL_DOCKER_PYTHON_VERSION}"
-  openbbterminal-deps:
-    platform: linux/amd64
-    build:
-      context: ..
-      dockerfile: docker/openbbterminal-deps.dockerfile
-      args:
-        OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
-        OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION}
-    image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-deps:${OPENBBTERMINAL_DOCKER_DEPS_VERSION}"
   openbbterminal-poetry-deps:
     platform: linux/amd64
     build:
@@ -24,27 +15,6 @@ services:
         OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
         OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION}
     image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-deps:${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION}"
-  openbbterminal-poetry-full-deps:
-    platform: linux/amd64
-    build:
-      context: ..
-      dockerfile: docker/openbbterminal-poetry-full-deps.dockerfile
-      args:
-        OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
-        OPENBBTERMINAL_DOCKER_PYTHON_VERSION: ${OPENBBTERMINAL_DOCKER_PYTHON_VERSION}
-        OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION}
-    image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full-deps:${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION}"
-  openbbterminal:
-    platform: linux/amd64
-    build:
-      context: ..
-      dockerfile: docker/openbbterminal.dockerfile
-      args:
-        OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
-        OPENBBTERMINAL_DOCKER_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_DEPS_VERSION}
-    image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal:${OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION}"
-    tty: true
-    env_file: setenv
   openbbterminal-poetry:
     platform: linux/amd64
     build:
@@ -56,25 +26,3 @@ services:
     image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry:${OPENBBTERMINAL_DOCKER_POETRY_VERSION}"
     tty: true
     env_file: setenv
-  openbbterminal-poetry-jupyter:
-    platform: linux/amd64
-    build:
-      context: ..
-      dockerfile: docker/openbbterminal-poetry-jupyter.dockerfile
-      args:
-        OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
-        OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION}
-    image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-jupyter:${OPENBBTERMINAL_DOCKER_POETRY_VERSION}"
-    tty: true
-    env_file: setenv
-  openbbterminal-poetry-full:
-    platform: linux/amd64
-    build:
-      context: ..
-      dockerfile: docker/openbbterminal-poetry-full.dockerfile
-      args:
-        OPENBBTERMINAL_DOCKER_IMAGE_PREFIX: ${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}
-        OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION: ${OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION}
-    image: "${OPENBBTERMINAL_DOCKER_IMAGE_PREFIX}/openbbterminal-poetry-full:${OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION}"
-    tty: true
-    env_file: setenv