diff --git a/.github/workflows/cleanup-ghcr.yml b/.github/workflows/cleanup-ghcr.yml
new file mode 100644
index 0000000..b64b157
--- /dev/null
+++ b/.github/workflows/cleanup-ghcr.yml
@@ -0,0 +1,25 @@
+name: Cleanup untagged Docker images
+
+on:
+  schedule:
+    - cron: '0 3 * * 0'  # Sunday 03:00 UTC
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        package:
+          - website-2026-backend
+          - website-2026-frontend
+    steps:
+      - name: Delete untagged versions
+        uses: actions/delete-package-versions@v5
+        with:
+          package-name: ${{ matrix.package }}
+          package-type: container
+          delete-only-untagged-versions: true
+          min-versions-to-keep: 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fadc91c..5cdd537 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 2.1.1
 
 - FIXED system - HTML and JS frontend caches causing failures
+- FIXED system - cleanup old docker images on registry
 
 ## 2.1.0