diff --git a/VERSION b/VERSION
index 7ce2027d1..5ca0d37ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.5.17
+v3.5.18
diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml
index f8c980bbb..77715b134 100644
--- a/deploy/clowdapp.yaml
+++ b/deploy/clowdapp.yaml
@@ -557,7 +557,7 @@ objects:
 parameters:
 # Manager
 - {name: REPLICAS_MANAGER, value: '1'}
-- {name: IMAGE_TAG_MANAGER, value: v3.5.17}
+- {name: IMAGE_TAG_MANAGER, value: v3.5.18}
 - {name: LOG_LEVEL_MANAGER, value: debug}
 - {name: DB_DEBUG_MANAGER, value: 'false'} # Log database queries if enabled
 - {name: ENABLE_CYNDI_TAGS, value: 'true'} # Enable filtering with Cyndi tags
@@ -582,7 +582,7 @@ parameters:
 
 # Listener
 - {name: REPLICAS_LISTENER, value: '1'}
-- {name: IMAGE_TAG_LISTENER, value: v3.5.17}
+- {name: IMAGE_TAG_LISTENER, value: v3.5.18}
 - {name: LOG_LEVEL_LISTENER, value: debug}
 - {name: DB_DEBUG_LISTENER, value: 'false'}
 - {name: CONSUMER_COUNT_LISTENER, value: '8'}
@@ -603,7 +603,7 @@ parameters:
 
 # Evaluator - upload
 - {name: REPLICAS_EVALUATOR_UPLOAD, value: '1'}
-- {name: IMAGE_TAG_EVALUATOR_UPLOAD, value: v3.5.17}
+- {name: IMAGE_TAG_EVALUATOR_UPLOAD, value: v3.5.18}
 - {name: LOG_LEVEL_EVALUATOR_UPLOAD, value: debug}
 - {name: DB_DEBUG_EVALUATOR_UPLOAD, value: 'false'}
 - {name: CONSUMER_COUNT_EVALUATOR_UPLOAD, value: '8'}
@@ -629,7 +629,7 @@ parameters:
 
 # Evaluator - recalc
 - {name: REPLICAS_EVALUATOR_RECALC, value: '1'}
-- {name: IMAGE_TAG_EVALUATOR_RECALC, value: v3.5.17}
+- {name: IMAGE_TAG_EVALUATOR_RECALC, value: v3.5.18}
 - {name: LOG_LEVEL_EVALUATOR_RECALC, value: debug}
 - {name: DB_DEBUG_EVALUATOR_RECALC, value: 'false'}
 - {name: CONSUMER_COUNT_EVALUATOR_RECALC, value: '8'}
@@ -652,7 +652,7 @@ parameters:
 - {name: ENABLE_PROFILER_EVALUATOR_RECALC, value: 'false'}
 
 # JOBS
-- {name: IMAGE_TAG_JOBS, value: v3.5.17}
+- {name: IMAGE_TAG_JOBS, value: v3.5.18}
 - {name: LOG_LEVEL_JOBS, value: debug}
 - {name: DB_DEBUG_JOBS, value: 'false'}
 - {name: JOBS_TIMEOUT, value: '1800'}  # 30 min timeout for jobs
@@ -697,7 +697,7 @@ parameters:
 - {name: SKIP_N_ACCOUNTS_REFRESH, value: '0'} # Skip advisory cache refresh for N first accounts in case the previous refresh didn't finish
 
 # Database admin
-- {name: IMAGE_TAG_DATABASE_ADMIN, value: v3.5.17}
+- {name: IMAGE_TAG_DATABASE_ADMIN, value: v3.5.18}
 - {name: LOG_LEVEL_DATABASE_ADMIN, value: debug}
 - {name: DB_DEBUG_DATABASE_ADMIN, value: 'false'}
 - {name: SCHEMA_MIGRATION, value: '-1'} # Set specific database schema version or use the last schema version (-1)
@@ -729,7 +729,7 @@ 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.5.17}
+- {name: IMAGE_TAG_ADMIN, value: v3.5.18}
 - {name: ENABLE_TURNPIKE_AUTH, value: 'true'} # Enable Turnpike authentication for internal API (manual sync, re-calc)
 - {name: REPLICAS_ADMIN, value: '1'}
 - {name: RES_LIMIT_CPU_ADMIN, value: 100m}
diff --git a/docs/admin/openapi.json b/docs/admin/openapi.json
index dce9a707c..9fd0d3cd2 100644
--- a/docs/admin/openapi.json
+++ b/docs/admin/openapi.json
@@ -8,7 +8,7 @@
             "name": "GPLv3",
             "url": "https://www.gnu.org/licenses/gpl-3.0.en.html"
         },
-        "version": "v3.5.17"
+        "version": "v3.5.18"
     },
     "servers": [
         {
diff --git a/docs/v3/openapi.json b/docs/v3/openapi.json
index 1180f5a56..18f8cdcbc 100644
--- a/docs/v3/openapi.json
+++ b/docs/v3/openapi.json
@@ -8,7 +8,7 @@
             "name": "GPLv3",
             "url": "https://www.gnu.org/licenses/gpl-3.0.en.html"
         },
-        "version": "v3.5.17"
+        "version": "v3.5.18"
     },
     "servers": [
         {