diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 92867a26..9834a3b9 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -3,6 +3,8 @@ name: Build and Push Docker Images
 on:
   push:
     branches: [ main ]
+    paths:
+      - 'build/VERSION'
   
   release:
     types: [ published ]
@@ -21,7 +23,6 @@ env:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, 'build/')
     permissions:
       contents: write
       packages: write
diff --git a/README.md b/README.md
index ea541c72..5edf039b 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 
 <div align="center">
   <img src="https://img.shields.io/github/stars/selfhst/icons">
-  <a href="https://selfh.st/icons"><img src="https://img.shields.io/badge/icons-5,143-0f60d9"></a>
-  <a href="https://github.com/selfhst/icons/blob/main/CHANGELOG.md"><img src="https://img.shields.io/badge/latest-v2.0.0-9926e0"></a>
+  <a href="https://selfh.st/icons"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fselfhst.github.io%2Fcdn%2Fassets%2Fbadges%2Ficons.json&query=%24.count&label=icons&color=0f60d9"></a>
+  <a href="https://github.com/selfhst/icons/blob/main/CHANGELOG.md"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fselfhst.github.io%2Fcdn%2Fassets%2Fbadges%2Ficons.json&query=%24.release&label=release&color=9926e0"></a>
   <a href="https://www.jsdelivr.com/package/gh/selfhst/icons"><img src="https://img.shields.io/jsdelivr/gh/hm/selfhst/icons"></a>
 </div>
 
@@ -23,4 +23,4 @@ By default, the directory provides SVG icons (when available) in standard, dark,
 
 ### Requests
 
-Requests for new or updated icons can be made via the repository's [discussions](https://github.com/selfhst/icons/discussions). To ensure quality and consistency, pull requests will not be accepted from unapproved members.
+Requests for new or updated icons can be made via the repository's [discussions](https://github.com/selfhst/icons/discussions). To ensure quality and consistency, pull requests will not be accepted from unapproved members.
\ No newline at end of file