diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc68941f8..450d424d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 
 ### Fixed
+- Fixed VIT0089530 ([#1392](https://github.com/opendevstack/ods-core/pull/1392))
 
 ## [4.13.0] - 2026-07-01
 ### Changed
diff --git a/delete-components/Jenkinsfile b/delete-components/Jenkinsfile
index 39d3f5711..3743ff8b7 100644
--- a/delete-components/Jenkinsfile
+++ b/delete-components/Jenkinsfile
@@ -3,6 +3,12 @@ def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
 def componentId = env.COMPONENT_ID.toLowerCase()
+if (!(projectId ==~ /^[A-Za-z\d]+$/)) {
+    throw new IllegalArgumentException("Invalid projectId: ${projectId}")
+}
+if (!(componentId ==~ /^[A-Za-z\d\-]+$/)) {
+    throw new IllegalArgumentException("Invalid componentId: ${componentId}")
+}
 
 // Jenkins DeploymentConfig environment variables
 def dockerRegistry
diff --git a/delete-projects/Jenkinsfile b/delete-projects/Jenkinsfile
index d565076aa..1da3810e4 100644
--- a/delete-projects/Jenkinsfile
+++ b/delete-projects/Jenkinsfile
@@ -2,6 +2,9 @@
 def odsNamespace = env.ODS_NAMESPACE ?: 'ods'
 def odsImageTag = env.ODS_IMAGE_TAG ?: 'latest'
 def projectId = env.PROJECT_ID
+if (!(projectId ==~ /^[A-Za-z\d]+$/)) {
+    throw new IllegalArgumentException("Invalid projectId: ${projectId}")
+}
 
 // Jenkins DeploymentConfig environment variables
 def dockerRegistry