diff --git a/.github/workflows/ghcr-images.yml b/.github/workflows/ghcr-images.yml
new file mode 100644
index 000000000..252872498
--- /dev/null
+++ b/.github/workflows/ghcr-images.yml
@@ -0,0 +1,26 @@
+name: build container images for GHCR
+
+on:
+  push:
+    branches: master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1        
+        # Use https://github.com/marketplace/actions/push-to-ghcr
+      - name: build the image
+        run: |
+        cd build/haven && \
+        docker buildx build \
+          --tag armchairancap/haven-for-tribler:latest \
+          --platform linux/amd64,linux/arm64 . && \
+        cd ../tribler && docker buildx build \
+          --tag armchairancap/tribler-haven:latest \
+          --platform linux/amd64,linux/arm64 .
diff --git a/README.md b/README.md
index d9e520dcb..062e677ed 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ haven-for-tribler    latest      d637b742a675   14 minutes ago   2.67GB
 
 Run with `cd build/tribler && docker compose up` and access Haven at http://localhost:3100. 
 
-Create a strong password when creating Haven identity and remember to [back it up](https://armchairancap.github.io/docs/speakeasy-user-guide/identity#backup-an-identity).
+Create a strong password when creating Haven identity and remember to [back it up](https://armchairancap.github.io/docs/haven-user-guide/identity#backup-an-identity).
 
 There's a sample Docker compose file in the build/tribler directory.