diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index d9f6c9c3..1a8cefa1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,10 +6,12 @@ on:
     paths:
       - '**'
       - 'website/**'
+  workflow_dispatch:
 
 jobs:
   build-main-app:
     runs-on: ubuntu-latest
+    if: contains(github.event.head_commit.modified, 'website/') == false
     steps:
     - name: Check out the repo
       uses: actions/checkout@v2
@@ -28,9 +30,12 @@ jobs:
 
   build-website:
     runs-on: ubuntu-latest
+    if: contains(github.event.head_commit.modified, 'website/')
     steps:
     - name: Check out the repo
       uses: actions/checkout@v2
+      with: 
+        submodules: 'true'
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
@@ -39,7 +44,7 @@ jobs:
     - name: Build and push website Docker image
       uses: docker/build-push-action@v2
       with:
-        context: website
+        context: ./website
         file: deploy/Dockerfile.proxy
         push: true
         tags: connectai/gitmaya-proxy:latest