diff --git a/freshrss/Dockerfile b/freshrss/Dockerfile
index 7fc09ef..ae48552 100644
--- a/freshrss/Dockerfile
+++ b/freshrss/Dockerfile
@@ -5,16 +5,19 @@ ARG DEBIAN_VERSION="bookworm"
 
 FROM dunglas/frankenphp:${FRANKENPHP_VERSION}-${DEBIAN_VERSION}
 
-ARG USER="freshrss"
-ARG SUPERCRONIC_VERSION="v0.2.32"
-ARG FRESHRSS_VERSION="1.21.0"
-ARG S6_OVERLAY_VERSION="v3.1.1.2"
-
 # Get target arch
 ARG TARGETARCH
 ARG TARGETOS
 
-# Set container root to read-only
+# Set user
+ARG USER="freshrss"
+
+# Set versions
+ARG SUPERCRONIC_VERSION="v0.2.32"
+ARG S6_OVERLAY_VERSION="v3.1.1.2"
+ARG FRESHRSS_VERSION="1.21.0"
+
+# Set container root to read-only and production
 ENV S6_READ_ONLY_ROOT="1"
 ENV FRESHRSS_ENV="production"
 
diff --git a/freshrss/renovate.json b/freshrss/renovate.json
index b2fd4eb..58c0cde 100644
--- a/freshrss/renovate.json
+++ b/freshrss/renovate.json
@@ -4,19 +4,19 @@
     {
       "fileMatch": ["freshrss/Dockerfile"],
       "matchStrings": [
-        "ARG S6_OVERLAY_VERSION=\"(?<currentValue>[^\"]+)\""
+        "ARG FRANKENPHP_VERSION=\"(?<currentValue>[^\"]+)\""
       ],
-      "depNameTemplate": "just-containers/s6-overlay",
-      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "dunglas/frankenphp",
+      "datasourceTemplate": "docker",
       "versioningTemplate": "semver",
       "extractVersionTemplate": "^v?(?<version>.*)$"
     },
     {
       "fileMatch": ["freshrss/Dockerfile"],
       "matchStrings": [
-        "ARG FRESHRSS_VERSION=\"(?<currentValue>[^\"]+)\""
+        "ARG SUPERCRONIC_VERSION=\"(?<currentValue>[^\"]+)\""
       ],
-      "depNameTemplate": "FreshRSS/FreshRSS",
+      "depNameTemplate": "aptible/supercronic",
       "datasourceTemplate": "github-releases",
       "versioningTemplate": "semver",
       "extractVersionTemplate": "^v?(?<version>.*)$"
@@ -24,9 +24,9 @@
     {
       "fileMatch": ["freshrss/Dockerfile"],
       "matchStrings": [
-        "ARG SUPERCRONIC_VERSION=\"(?<currentValue>[^\"]+)\""
+        "ARG S6_OVERLAY_VERSION=\"(?<currentValue>[^\"]+)\""
       ],
-      "depNameTemplate": "aptible/supercronic",
+      "depNameTemplate": "just-containers/s6-overlay",
       "datasourceTemplate": "github-releases",
       "versioningTemplate": "semver",
       "extractVersionTemplate": "^v?(?<version>.*)$"
@@ -34,24 +34,29 @@
     {
       "fileMatch": ["freshrss/Dockerfile"],
       "matchStrings": [
-        "ARG FRANKENPHP_VERSION=\"(?<currentValue>[^\"]+)\""
+        "ARG FRESHRSS_VERSION=\"(?<currentValue>[^\"]+)\""
       ],
-      "depNameTemplate": "dunglas/frankenphp",
-      "datasourceTemplate": "docker",
+      "depNameTemplate": "FreshRSS/FreshRSS",
+      "datasourceTemplate": "github-tags",
       "versioningTemplate": "semver",
-      "extractVersionTemplate": "^v?(?<version>.*)$"
+      "extractVersionTemplate": "^(?<version>.*)$"
     }
   ],
   "packageRules": [
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["dunglas/frankenphp"],
+      "extractVersionTemplate": "^(?<version>[0-9.]+)-bookworm$"
+    },
     {
       "matchDatasources": ["github-releases"],
-      "matchPackagePrefixes": ["just-containers", "FreshRSS", "aptible"],
+      "matchPackageNames": ["just-containers/s6-overlay", "aptible/supercronic"],
       "extractVersionTemplate": "^v?(?<version>.*)$"
     },
     {
-      "matchDatasources": ["docker"],
-      "matchPackageNames": ["dunglas/frankenphp"],
-      "extractVersionTemplate": "^(?<version>[0-9.]+)-bookworm$"
+      "matchDatasources": ["github-tags"],
+      "matchPackageNames": ["FreshRSS/FreshRSS"],
+      "extractVersionTemplate": "^(?<version>.*)$"
     }
   ]
 }
\ No newline at end of file