diff --git a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
index c97b26ba7..4ecf8e7a4 100644
--- a/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
+++ b/web/src/pages/AddUpdatePipeline/AddUpdatePipeline.tsx
@@ -31,7 +31,7 @@ import { getErrorMessage } from 'utils/Utils'
 import { decodeGitContent } from 'utils/GitUtils'
 import pipelineSchemaV1 from './schema/pipeline-schema-v1.json'
 import pipelineSchemaV0 from './schema/pipeline-schema-v0.json'
-import { DRONE_CONFIG_YAML_FILE_SUFFIXES, YamlVersion } from './Constants'
+import { V1_SCHEMA_YAML_FILE_REGEX, YamlVersion } from './Constants'
 
 import css from './AddUpdatePipeline.module.scss'
 
@@ -145,9 +145,9 @@ const AddUpdatePipeline = (): JSX.Element => {
   // set YAML version for Pipeline setup
   useEffect(() => {
     setYAMLVersion(
-      DRONE_CONFIG_YAML_FILE_SUFFIXES.find((suffix: string) => pipelineData?.config_path?.endsWith(suffix))
-        ? YamlVersion.V0
-        : YamlVersion.V1
+      pipelineData?.config_path && V1_SCHEMA_YAML_FILE_REGEX.test(pipelineData.config_path)
+        ? YamlVersion.V1
+        : YamlVersion.V0
     )
   }, [pipelineData])
 
diff --git a/web/src/pages/AddUpdatePipeline/Constants.ts b/web/src/pages/AddUpdatePipeline/Constants.ts
index ed17db88d..1bf8844af 100644
--- a/web/src/pages/AddUpdatePipeline/Constants.ts
+++ b/web/src/pages/AddUpdatePipeline/Constants.ts
@@ -7,3 +7,5 @@ export const DEFAULT_YAML_PATH_PREFIX = '.harness/'
 export const DEFAULT_YAML_PATH_SUFFIX = '.yaml'
 
 export const DRONE_CONFIG_YAML_FILE_SUFFIXES = ['.drone.yml', '.drone.yaml']
+
+export const V1_SCHEMA_YAML_FILE_REGEX = /^(.*v1\.ya?ml)$/i