diff --git a/.github/workflows/publish-dockerhub.yml b/.github/workflows/publish-dockerhub.yml
new file mode 100644
index 0000000..f57fc2f
--- /dev/null
+++ b/.github/workflows/publish-dockerhub.yml
@@ -0,0 +1,26 @@
+name: Publish on Docker Hub
+
+on: workflow_dispatch
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Login to Docker Hub
+              run: docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_KEY }}
+
+            - name: Build base Sherlock image
+              run: docker build -t sherlock .
+
+            - name: Build and push Sherlock API image
+              run: cd sherlock-web/api &&
+                docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/sherlock-api:latest . &&
+                docker push ${{ secrets.DOCKERHUB_USERNAME }}/sherlock-api:latest
+
+            - name: Build and push sherlock-frontend image
+              run: |
+                docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/sherlock-web:latest -f ./sherlock-web/frontend/Dockerfile . &&
+                docker push ${{ secrets.DOCKERHUB_USERNAME }}/sherlock-web:latest
\ No newline at end of file
diff --git a/sherlock-web/frontend/Dockerfile b/sherlock-web/frontend/Dockerfile
index aca1e2d..f637e52 100644
--- a/sherlock-web/frontend/Dockerfile
+++ b/sherlock-web/frontend/Dockerfile
@@ -11,7 +11,7 @@ COPY ./sherlock-web/frontend/next.config.mjs ./src/next.config.mjs
 COPY ./sherlock-web/frontend/app/ ./app/
 COPY ./sherlock-web/frontend/public/ ./public/
 
-COPY ./sherlock/resources/data.json ./
+COPY ./sherlock/resources/data.json ./data.json
 
 RUN npm run build