diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index fff46530a0..d6017454ee 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -47,6 +47,7 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
           build-args: |
             GIT_BRANCH=${{ github.ref_name }}
             GIT_REPO=https://github.com/${{ github.repository }}
diff --git a/build/docker/compose.yml b/build/docker/compose.yml
index a25c6a8590..0df28afeb4 100644
--- a/build/docker/compose.yml
+++ b/build/docker/compose.yml
@@ -1,7 +1,7 @@
 
 services:
   tribler:
-    image: ghcr.io/tribler/tribler:main
+    image: ghcr.io/tribler/tribler:latest
     network_mode: host
     environment:
       CORE_API_PORT: 8085