diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 00000000000..78adccec19e
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,25 @@
+name: Build and Publish Docker
+
+on: workflow_dispatch
+
+jobs:
+  publish-image:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build the Docker image
+      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
diff --git a/docker/compose.env b/docker/compose.env
index 5f66717e76c..a08b6757ca4 100644
--- a/docker/compose.env
+++ b/docker/compose.env
@@ -1,11 +1,12 @@
 OPENBBTERMINAL_DOCKER_IMAGE_PREFIX="ghcr.io/openbb-finance"
-OPENBBTERMINAL_DOCKER_PYTHON_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_DEPS_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_POETRY_VERSION="1.6.0"
-OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION="1.6.0"
+OPENBBTERMINAL_DOCKER_PYTHON_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_DEPS_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_POETRY_DEPS_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_POETRY_FULL_DEPS_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_OPENBBTERMINAL_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_POETRY_VERSION="1.7.0"
+OPENBBTERMINAL_DOCKER_POETRY_FULL_VERSION="1.7.0"
+DOCKER_DEFAULT_PLATFORM=linux/amd64
 
 export OPENBBTERMINAL_DOCKER_IMAGE_PREFIX
 export OPENBBTERMINAL_DOCKER_PYTHON_VERSION
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index b2b61dd4a3a..cd431512a18 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,11 +1,13 @@
 version: '3.8'
 services:
   openbbterminal-python:
+    platform: linux/amd64
     build:
       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
@@ -14,6 +16,7 @@ services:
         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:
       context: ..
       dockerfile: docker/openbbterminal-poetry-deps.dockerfile
@@ -22,6 +25,7 @@ services:
         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
@@ -31,6 +35,7 @@ services:
         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
@@ -41,6 +46,7 @@ services:
     tty: true
     env_file: setenv
   openbbterminal-poetry:
+    platform: linux/amd64
     build:
       context: ..
       dockerfile: docker/openbbterminal-poetry.dockerfile
@@ -51,6 +57,7 @@ services:
     tty: true
     env_file: setenv
   openbbterminal-poetry-jupyter:
+    platform: linux/amd64
     build:
       context: ..
       dockerfile: docker/openbbterminal-poetry-jupyter.dockerfile
@@ -61,6 +68,7 @@ services:
     tty: true
     env_file: setenv
   openbbterminal-poetry-full:
+    platform: linux/amd64
     build:
       context: ..
       dockerfile: docker/openbbterminal-poetry-full.dockerfile