diff --git a/booking-system/booking.yaml b/booking-system/booking.yaml
index bf3476f..15f987d 100644
--- a/booking-system/booking.yaml
+++ b/booking-system/booking.yaml
@@ -162,7 +162,8 @@ spec:
       labels:
         app.kubernetes.io/instance: calcom
         app.kubernetes.io/name: calcom
-        app.kubernetes.io/version: "v6.0.8"
+      annotations:
+        match-regex.version-checker.io/calcom: '^v?\d+\.\d+\.\d+$'
     spec:
       initContainers:
         # Wait for PostgreSQL
@@ -193,7 +194,7 @@ spec:
               echo "Redis is ready!"
       containers:
         - name: calcom
-          image: calcom/cal.com:v6.0.8
+          image: docker.io/calcom/cal.com:v6.0.8
           imagePullPolicy: IfNotPresent
           command:
             - /bin/sh
diff --git a/bookstack-system/bookstack.yaml b/bookstack-system/bookstack.yaml
index b2d6eb6..29515fd 100644
--- a/bookstack-system/bookstack.yaml
+++ b/bookstack-system/bookstack.yaml
@@ -171,7 +171,7 @@ spec:
         app.kubernetes.io/instance: bookstack
         app.kubernetes.io/name: bookstack
       annotations:
-        match-regex.version-checker.io/code-server: '^[0-9]+\.[0-9]+\.[0-9]+$'
+        match-regex.version-checker.io/bookstack: '^\d+\.\d+\.\d+$'
     spec:
       containers:
         - name: bookstack
diff --git a/calibre-system/calibre.yaml b/calibre-system/calibre.yaml
index 01b73ac..7366b0f 100644
--- a/calibre-system/calibre.yaml
+++ b/calibre-system/calibre.yaml
@@ -15,7 +15,6 @@ metadata:
   labels:
     app.kubernetes.io/instance: calibre
     app.kubernetes.io/name: calibre
-    app.kubernetes.io/version: v8.16.2-ls375
 spec:
   replicas: 1
   strategy:
@@ -29,11 +28,12 @@ spec:
       labels:
         app.kubernetes.io/instance: calibre
         app.kubernetes.io/name: calibre
-        app.kubernetes.io/version: v8.16.2-ls375
+      annotations:
+        match-regex.version-checker.io/calibre: '^\d+\.\d+\.\d+$'
     spec:
       containers:
         - name: calibre
-          image: lscr.io/linuxserver/calibre:v8.16.2-ls375
+          image: linuxserver/calibre:8.16.2
           imagePullPolicy: IfNotPresent
           env:
             - name: PUID
@@ -121,11 +121,12 @@ spec:
       labels:
         app.kubernetes.io/instance: calibre
         app.kubernetes.io/name: calibre-web
-        app.kubernetes.io/version: 0.6.25-ls361
+      annotations:
+        match-regex.version-checker.io/calibre-web: '^\d+\.\d+\.\d+$'
     spec:
       containers:
         - name: calibre-web
-          image: lscr.io/linuxserver/calibre-web:0.6.25-ls361
+          image: linuxserver/calibre-web:0.6.25
           imagePullPolicy: IfNotPresent
           env:
             - name: PUID
diff --git a/crafty-system/crafty.yaml b/crafty-system/crafty.yaml
index af5543f..162f1bf 100644
--- a/crafty-system/crafty.yaml
+++ b/crafty-system/crafty.yaml
@@ -33,7 +33,6 @@ metadata:
   labels:
     app.kubernetes.io/name: craftycontroller
     app.kubernetes.io/instance: crafty
-    app.kubernetes.io/version: 4.7.0
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -193,7 +192,6 @@ metadata:
   labels:
     app.kubernetes.io/name: craftycontroller
     app.kubernetes.io/instance: crafty
-    app.kubernetes.io/version: 4.7.0
 spec:
   serviceName: craftycontroller-headless
   replicas: 1
@@ -206,7 +204,8 @@ spec:
       labels:
         app.kubernetes.io/name: craftycontroller
         app.kubernetes.io/instance: crafty
-        app.kubernetes.io/version: 4.7.0
+      annotations:
+        match-regex.version-checker.io/craftycontroller: '^\d+\.\d+\.\d+$'
     spec:
       serviceAccountName: craftycontroller
       hostNetwork: true
@@ -215,7 +214,7 @@ spec:
         fsGroup: 0
       containers:
       - name: craftycontroller
-        image: registry.gitlab.com/crafty-controller/crafty-4:4.7.0
+        image: arcadiatechnology/crafty-4:4.7.0
         imagePullPolicy: IfNotPresent
         securityContext:
           runAsNonRoot: true
diff --git a/immich-system/immich.yaml b/immich-system/immich.yaml
index 9b37832..03af9eb 100644
--- a/immich-system/immich.yaml
+++ b/immich-system/immich.yaml
@@ -38,6 +38,8 @@ spec:
       labels:
         app.kubernetes.io/instance: immich
         app.kubernetes.io/name: postgres
+      annotations:
+        match-regex.version-checker.io/postgres: '^\d+-vectorchord\d+\.\d+\.\d+$'
     spec:
       securityContext:
         fsGroup: 999
diff --git a/outline-system/outline.yaml b/outline-system/outline.yaml
index 20ae8b5..ccc1460 100644
--- a/outline-system/outline.yaml
+++ b/outline-system/outline.yaml
@@ -27,7 +27,7 @@ spec:
         app.kubernetes.io/instance: outline
         app.kubernetes.io/name: outline
       annotations:
-        match-regex.version-checker.io/outline: '?\d+\.\d+\.\d+$'
+        match-regex.version-checker.io/outline: '^\d+\.\d+\.\d+$'
     spec:
       containers:
       - name: outline
diff --git a/termix-system/termix.yaml b/termix-system/termix.yaml
index 631cf02..d52c3fe 100644
--- a/termix-system/termix.yaml
+++ b/termix-system/termix.yaml
@@ -36,6 +36,8 @@ spec:
       labels:
         app.kubernetes.io/name: termix
         app.kubernetes.io/instance: termix
+      annotations:
+        match-regex.version-checker.io/termix: '^release-\d+\.\d+\.\d+$'
     spec:
       containers:
         - name: termix