diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml
index 5e5e343d9..3514e398a 100644
--- a/.github/workflows/semantic-release.yml
+++ b/.github/workflows/semantic-release.yml
@@ -18,7 +18,6 @@ jobs:
         RELEASE_TYPE=$(git log -1 | tail -n1) # Check release type (/major, /minor, /patch (default))
         VERSION_NEXT=$(./scripts/increment_version.sh $VERSION $RELEASE_TYPE)
         sed -i 's|\("version": "\)[^"]*\("\)$|'"\1$VERSION_NEXT\2|;" $DOC_FILE
-        sed -i -E "s/\{name: IMAGE_TAG_(MANAGER|LISTENER|EVALUATOR_UPLOAD|EVALUATOR_RECALC|JOBS|DATABASE_ADMIN|ADMIN), value: .*\}/{name: IMAGE_TAG_\1, value: $VERSION_NEXT}/" $CLOWDER_FILE
         echo $VERSION_NEXT >VERSION
         git config --global user.name 'semantic-release'
         git config --global user.email ''
diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml
index 6e8a911ca..3f53282c9 100644
--- a/deploy/clowdapp.yaml
+++ b/deploy/clowdapp.yaml
@@ -19,10 +19,10 @@ objects:
         private:
           enabled: false
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_ADMIN}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -51,10 +51,10 @@ objects:
         private:
           enabled: true
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_MANAGER}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: db-migration
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/entrypoint.sh
             env:
@@ -122,10 +122,10 @@ objects:
         metrics:
           enabled: true
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_LISTENER}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -166,10 +166,10 @@ objects:
         metrics:
           enabled: true
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_EVALUATOR_UPLOAD}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -211,10 +211,10 @@ objects:
         metrics:
           enabled: true
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_EVALUATOR_RECALC}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -253,10 +253,10 @@ objects:
       suspend: ${{VMAAS_SYNC_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -290,10 +290,10 @@ objects:
       suspend: ${{CULLING_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -318,10 +318,10 @@ objects:
       suspend: ${{PKG_REFRESH_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -352,10 +352,10 @@ objects:
       suspend: ${{ADVISORY_REFRESH_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -379,10 +379,10 @@ objects:
       suspend: ${{DELETE_UNUSED_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -406,10 +406,10 @@ objects:
       suspend: ${{REPACK_SUSPEND}}
       concurrencyPolicy: Forbid
       podSpec:
-        image: ${IMAGE}:${IMAGE_TAG_JOBS}
+        image: ${IMAGE}:${IMAGE_TAG}
         initContainers:
           - name: check-for-db
-            image: ${IMAGE}:${IMAGE_TAG_DATABASE_ADMIN}
+            image: ${IMAGE}:${IMAGE_TAG}
             command:
               - ./database_admin/check-upgraded.sh
             env:
@@ -532,7 +532,6 @@ objects:
 parameters:
 # Manager
 - {name: REPLICAS_MANAGER, value: '1'}
-- {name: IMAGE_TAG_MANAGER, value: v3.7.20}
 - {name: LOG_LEVEL_MANAGER, value: debug}
 - {name: DB_DEBUG_MANAGER, value: 'false'} # Log database queries if enabled
 - {name: EVAL_TOPIC_MANAGER, value: patchman.evaluator.upload}
@@ -554,7 +553,6 @@ parameters:
 
 # Listener
 - {name: REPLICAS_LISTENER, value: '1'}
-- {name: IMAGE_TAG_LISTENER, value: v3.7.20}
 - {name: LOG_LEVEL_LISTENER, value: debug}
 - {name: DB_DEBUG_LISTENER, value: 'false'}
 - {name: RES_LIMIT_CPU_LISTENER, value: 250m}
@@ -571,7 +569,6 @@ parameters:
 
 # Evaluator - upload
 - {name: REPLICAS_EVALUATOR_UPLOAD, value: '1'}
-- {name: IMAGE_TAG_EVALUATOR_UPLOAD, value: v3.7.20}
 - {name: LOG_LEVEL_EVALUATOR_UPLOAD, value: debug}
 - {name: DB_DEBUG_EVALUATOR_UPLOAD, value: 'false'}
 - {name: RES_LIMIT_CPU_EVALUATOR_UPLOAD, value: 256m}
@@ -583,7 +580,6 @@ parameters:
 
 # Evaluator - recalc
 - {name: REPLICAS_EVALUATOR_RECALC, value: '1'}
-- {name: IMAGE_TAG_EVALUATOR_RECALC, value: v3.7.20}
 - {name: LOG_LEVEL_EVALUATOR_RECALC, value: debug}
 - {name: DB_DEBUG_EVALUATOR_RECALC, value: 'false'}
 - {name: RES_LIMIT_CPU_EVALUATOR_RECALC, value: 256m}
@@ -594,7 +590,6 @@ parameters:
 - {name: EVALUATOR_RECALC_CONFIG, value: ''}
 
 # JOBS
-- {name: IMAGE_TAG_JOBS, value: v3.7.20}
 - {name: LOG_LEVEL_JOBS, value: debug}
 - {name: DB_DEBUG_JOBS, value: 'false'}
 - {name: JOBS_TIMEOUT, value: '1800'}  # 30 min timeout for jobs
@@ -627,7 +622,6 @@ parameters:
 
 
 # Database admin
-- {name: IMAGE_TAG_DATABASE_ADMIN, value: v3.7.20}
 - {name: LOG_LEVEL_DATABASE_ADMIN, value: debug}
 - {name: DB_DEBUG_DATABASE_ADMIN, value: 'false'}
 - {name: RES_LIMIT_CPU_DATABASE_ADMIN, value: 100m}
@@ -648,7 +642,6 @@ parameters:
 - {name: DB_WORK_MEM, value: '512000'} # How much memory can query use (used for packages queries) in kB - 500MB, postgres default is 4MB
 
 # Turnpike
-- {name: IMAGE_TAG_ADMIN, value: v3.7.20}
 - {name: REPLICAS_ADMIN, value: '1'}
 - {name: RES_LIMIT_CPU_ADMIN, value: 100m}
 - {name: RES_LIMIT_MEM_ADMIN, value: 256Mi}