diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a972a9d9..9ec16fbf 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -33,14 +33,23 @@ jobs:
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME:${{ github.ref == 'refs/heads/next' && 'next' || github.ref_name }}
         if: github.ref == 'refs/heads/next' || startsWith(github.ref, 'refs/tags/v')
+      - name: Set Tags
+        id: set_tags
+        run: |
+          TAGS=""
+          if [ "${{ github.ref }}" == "refs/heads/next" ]; then
+            TAGS="next"
+          fi
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            TAGS="${TAGS:+$TAGS,}${GITHUB_REF#refs/tags/}"
+            TAGS="${TAGS:+$TAGS,}latest"
+          fi
+          echo "::set-output name=tags::$TAGS"
       - name: Push to Docker Hub
         uses: docker/build-push-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: skytable/skytable
-          tags: |
-            ${{ github.ref == 'refs/heads/next' && 'next' || '' }}
-            ${{ startsWith(github.ref, 'refs/tags/v') && github.ref_name || '' }}
-            ${{ startsWith(github.ref, 'refs/tags/v') && 'latest' || '' }}
+          tags: ${{ steps.set_tags.outputs.tags }}
         if: github.ref == 'refs/heads/next' || startsWith(github.ref, 'refs/tags/v')
diff --git a/README.md b/README.md
index 095b6755..2ea3f97c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
     Skytable — A modern database for building powerful experiences
 </h2>
 <h3 align="center">
-    Performance, scalability and flexibility. Choose three.
+    Performance, scalability, and flexibility. Choose three.
 </h3>
 </p>
 <p align="center">