diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 66a3dd0..fe6035b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -21,9 +21,9 @@ jobs:
         BRANCH_NAME="${GITHUB_REF#refs/heads/}"
         REF="${BRANCH_NAME:-master}"
         OTHER_TAGS=""
-
-        if [[ "${REF}" = "master" ]]
+        if [[ ${GITHUB_REF} =~ ^refs\/tags\/v.*$ ]]
         then
+          REF="${GITHUB_REF//refs\/tags\/}"
           OTHER_TAGS="${OTHER_TAGS} -t ${GITHUB_REPOSITORY}:latest"
         fi
 
diff --git a/README.md b/README.md
index 11a390b..d4871b5 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,18 @@ services:
 
 ## How to use a running instance
 
-1. Upload files:
+1. Upload files
 
-  - ```bash
-    curl --progress-bar --upload-file ~/Downloads/ubuntu-19.04-live-server-amd64.iso http://<yourhost>:8000
-    ```
+    - ```bash
+      curl --progress-bar --upload-file ~/Downloads/ubuntu-19.04-live-server-amd64.iso http://<yourhost>:8000
+      ```
 
 2. Download files from a URL like <https://send.firefox.com/download/file_id/#file_key>
 
-  - ```bash
-    wget http://<yourhost>:8000/file_id/file_key -O file_name.iso
-    ```
+    - ```bash
+      wget http://<yourhost>:8000/file_id/file_key -O file_name.iso
+      ```
 
-  - ```bash
-    wget http://<yourhost>:8000/download?url=https%3A%2F%2Fsend.firefox.com%2Fdownload%2Ffile_id%2F%23file_key -O file_name.iso
-    ```
+    - ```bash
+      wget http://<yourhost>:8000/download?url=https%3A%2F%2Fsend.firefox.com%2Fdownload%2Ffile_id%2F%23file_key -O file_name.iso
+      ```