diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 31ff70f8..6ac8836d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -166,5 +166,7 @@ jobs:
           push: true
           tags: |
             bpatrik/pigallery2:nightly-${{ matrix.container }}
+            bpatrik/pigallery2:${{ steps.vars.outputs.tag }}-${{ matrix.container }}
+            bpatrik/pigallery2:latest-${{ matrix.container }}
             bpatrik/pigallery2:${{ steps.vars.outputs.tag }}
             bpatrik/pigallery2:latest
diff --git a/docker/README.md b/docker/README.md
index 418c71c5..30426c59 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,10 +1,10 @@
 # PiGallery2 docker installation [![Docker build](https://github.com/bpatrik/pigallery2/workflows/docker-buildx/badge.svg)](https://github.com/bpatrik/pigallery2/actions)
 
-## NOTE: docker tag `latest` does not work currently use its alias: `latest-debian-buster` instead until it gets fixed.
+## NOTE: alpine does not support armV7 (like Rapsberry Pi) temporary. See https://github.com/bpatrik/pigallery2/issues/295#issuecomment-1032569180
 
 You can use [docker](https://docs.docker.com/install/) to run PiGallery2. See all available docker tags [here](https://hub.docker.com/r/bpatrik/pigallery2/tags/).
 available tags:
- - `v*` (stable): built from the a release with the same version name.
+ - `v*` (stable): built from the release with the same version name.
  - `latest` (stable): same as the latest `v*`, built with debian buster
  - `nightly` : built from the current state of `master`. This might break from time to time. 
 
diff --git a/docker/docker-compose/default/docker-compose.yml b/docker/docker-compose/default/docker-compose.yml
index cdacc76b..e4a4a6df 100644
--- a/docker/docker-compose/default/docker-compose.yml
+++ b/docker/docker-compose/default/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     restart: always
 
   pigallery2:
-    image: bpatrik/pigallery2:latest-debian-buster # TODO: change it back to latest once relese workflow gets fixed
+    image: bpatrik/pigallery2:latest
     container_name: pigallery2
     environment:
       - NODE_ENV=production