diff --git a/.github/workflows/update-instances.yml b/.github/workflows/update-instances.yml
index 608942a..a047b2a 100644
--- a/.github/workflows/update-instances.yml
+++ b/.github/workflows/update-instances.yml
@@ -263,6 +263,22 @@ jobs:
 
         apply_update
 
+        # ==============================================================
+        # Rimgo update
+        # ==============================================================
+
+        curl -s https://rimgo.codeberg.page/api.json | \
+          jq '[
+            .clearnet[] |
+            .url] |
+            sort' > rimgo-tmp.json
+
+        jq --slurpfile rimgo rimgo-tmp.json \
+          '(.[] | select(.type == "rimgo") )
+          .instances |= $rimgo[0]' services-full.json > services-tmp.json
+
+          apply_update
+
         # ==============================================================
         # TODO: Update instances for other services
         # ==============================================================
diff --git a/services-full.json b/services-full.json
index 15beb29..ec2c596 100644
--- a/services-full.json
+++ b/services-full.json
@@ -243,26 +243,31 @@
   {
     "type": "rimgo",
     "test_url": "/a/H8M4rcp",
-    "fallback": "https://i.bcow.xyz",
+    "fallback": "https://rimgo.projectsegfau.lt",
     "instances": [
-      "https://i.bcow.xyz",
-      "https://rimgo.pussthecat.org",
-      "https://rimgo.totaldarkness.net",
-      "https://rimgo.bus-hit.me",
-      "https://imgur.artemislena.eu",
-      "https://rimgo.vern.cc",
-      "https://rim.odyssey346.dev",
       "https://i.habedieeh.re",
-      "https://rimgo.hostux.net",
+      "https://imgur.010032.xyz",
+      "https://imgur.artemislena.eu",
       "https://ri.zzls.xyz",
-      "https://rimgo.lunar.icu",
+      "https://rimgo.bus-hit.me",
+      "https://rimgo.catsarch.com",
+      "https://rimgo.drgns.space",
+      "https://rimgo.ducks.party",
+      "https://rimgo.eu.projectsegfau.lt",
+      "https://rimgo.fascinated.cc",
+      "https://rimgo.frontendfriendly.xyz",
+      "https://rimgo.frylo.net",
+      "https://rimgo.hostux.net",
+      "https://rimgo.in.projectsegfau.lt",
       "https://rimgo.kling.gg",
-      "https://i.01r.xyz",
+      "https://rimgo.lunar.icu",
+      "https://rimgo.nohost.network",
       "https://rimgo.projectsegfau.lt",
-      "https://rimgo.fascinated.cc",
-      "https://rimgo.whateveritworks.org",
-      "https://rimgo.catsarch.com",
-      "https://rimgo.frontendfriendly.xyz"
+      "https://rimgo.pussthecat.org",
+      "https://rimgo.quantenzitrone.eu",
+      "https://rimgo.totaldarkness.net",
+      "https://rimgo.us.projectsegfau.lt",
+      "https://rimgo.whateveritworks.org"
     ]
   },
   {