diff --git a/package-lock.json b/package-lock.json
index 01938014c..4de27b84f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.13.0",
+    "version": "1.13.0-beta-7",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "1.13.0",
+            "version": "1.13.0-beta-7",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index a10088e67..351847c19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.13.0",
+    "version": "1.13.0-beta-7",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Assets/IconV2/ic-fast-forward.svg b/src/Assets/IconV2/ic-fast-forward.svg
new file mode 100644
index 000000000..97cf87d0d
--- /dev/null
+++ b/src/Assets/IconV2/ic-fast-forward.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M2.5 6.964v10.53a.742.742 0 0 0 1.142.617l8.269-5.265a.732.732 0 0 0 0-1.235L3.642 6.346a.742.742 0 0 0-1.142.618Z" vector-effect="non-scaling-stroke"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M12.251 6.964v10.53a.742.742 0 0 0 1.142.617l8.27-5.265a.732.732 0 0 0 0-1.235l-8.27-5.265a.742.742 0 0 0-1.142.618Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-filter-applied.svg b/src/Assets/IconV2/ic-filter-applied.svg
new file mode 100644
index 000000000..86f00f5a1
--- /dev/null
+++ b/src/Assets/IconV2/ic-filter-applied.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path data-style-override="false" fill="var(--R500)" d="M23 7a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"/>
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12h10M2 7.5h12m-4.25 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-filter.svg b/src/Assets/IconV2/ic-filter.svg
new file mode 100644
index 000000000..aeda5ba8f
--- /dev/null
+++ b/src/Assets/IconV2/ic-filter.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6 12h12M2 7.5h19.5m-11.75 9h4.5" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-lego.svg b/src/Assets/IconV2/ic-lego.svg
new file mode 100644
index 000000000..fbefc99b3
--- /dev/null
+++ b/src/Assets/IconV2/ic-lego.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.5 15v6m0-6-6-3m6 3 15-7.5M7.5 21l15-7.5v-6M7.5 21l-6-3v-6m0 0 3.393-1.697M22.5 7.5l-4.572-2.287m-5.535 1.34L9.52 7.99m.979 1.386c0 1.036-1.343 1.875-3 1.875s-3-.84-3-1.875c0-1.036 1.343-1.875 3-1.875s3 .84 3 1.875Zm7.5-3.75C18 6.661 16.657 7.5 15 7.5s-3-.84-3-1.875c0-1.036 1.343-1.875 3-1.875s3 .84 3 1.875Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-magnifying-glass.svg b/src/Assets/IconV2/ic-magnifying-glass.svg
new file mode 100644
index 000000000..f560eb621
--- /dev/null
+++ b/src/Assets/IconV2/ic-magnifying-glass.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M16.443 16.444 21 21m-2.25-10.125a7.875 7.875 0 1 1-15.75 0 7.875 7.875 0 0 1 15.75 0Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Assets/IconV2/ic-play-outline.svg b/src/Assets/IconV2/ic-play-outline.svg
new file mode 100644
index 000000000..991073048
--- /dev/null
+++ b/src/Assets/IconV2/ic-play-outline.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path stroke="#3B444C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M20.639 11.36 7.14 3.111a.75.75 0 0 0-1.14.64v16.498a.75.75 0 0 0 1.141.64l13.498-8.25a.751.751 0 0 0 0-1.279Z" vector-effect="non-scaling-stroke"/>
+</svg>
diff --git a/src/Common/Checkbox.tsx b/src/Common/Checkbox.tsx
index ee6b18d41..d8e8b1cfe 100644
--- a/src/Common/Checkbox.tsx
+++ b/src/Common/Checkbox.tsx
@@ -35,7 +35,7 @@ export class Checkbox extends Component<CheckboxProps> {
                 <input
                     {...(this.props.name ? { name: this.props.name } : {})}
                     type="checkbox"
-                    className="form__checkbox"
+                    className={`form__checkbox ${this.props.error ? 'error': ''}`}
                     disabled={this.props.disabled}
                     value={this.props.value}
                     onChange={this.props.onChange}
diff --git a/src/Common/Types.ts b/src/Common/Types.ts
index 9f67632bd..f82b80877 100644
--- a/src/Common/Types.ts
+++ b/src/Common/Types.ts
@@ -28,6 +28,7 @@ import {
     ButtonProps,
     ComponentLayoutType,
     StatusType,
+    DeploymentStrategyType,
 } from '../Shared'
 import {
     ACTION_STATE,
@@ -116,6 +117,7 @@ export interface CheckboxProps {
     onClick?: (event) => void
     id?: string
     dataTestId?: string
+    error?: boolean
 }
 
 export interface TippyCustomizedProps extends Pick<TippyProps, 'appendTo'> {
@@ -845,7 +847,7 @@ export interface AppEnvironment {
 }
 
 export interface Strategy {
-    deploymentTemplate: string
+    deploymentTemplate: DeploymentStrategyType
     config: any
     default?: boolean
 }
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts b/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts
index 3dcbaa952..de98bd239 100644
--- a/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts
+++ b/src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts
@@ -73,6 +73,7 @@ export const triggerCDNode = ({
     abortControllerRef,
     skipIfHibernated,
     isRollbackTrigger = false,
+    strategy,
 }: TriggerCDNodeServiceProps) => {
     const areRuntimeParamsConfigured =
         runtimeParamsPayload && (stageType === DeploymentNodeType.POSTCD || stageType === DeploymentNodeType.PRECD)
@@ -85,6 +86,7 @@ export const triggerCDNode = ({
         isRollbackDeployment: isRollbackTrigger,
         ...(areRuntimeParamsConfigured && runtimeParamsPayload),
         ...(skipIfHibernated ? { skipIfHibernated: true } : {}),
+        ...(strategy ? { strategy } : {}),
     }
 
     if (deploymentWithConfig) {
diff --git a/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx b/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
index cf167f860..7f3ce0d8f 100644
--- a/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
+++ b/src/Pages/Applications/DevtronApps/Details/CDPipeline/types.tsx
@@ -17,7 +17,7 @@
 import { BuildStageType, FormType } from '@Common/CIPipeline.Types'
 import { APIOptions, DeploymentAppTypes, DeploymentNodeType } from '@Common/Types'
 import { DeploymentStrategy } from '@Shared/Components'
-import { EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
+import { DeploymentStrategyType, EnvListMinDTO, RuntimeParamsTriggerPayloadType } from '@Shared/types'
 import { STAGE_MAP } from '@Pages/index'
 
 interface ConfigSecretType {
@@ -136,6 +136,7 @@ export interface TriggerCDNodeServiceProps extends Pick<APIOptions, 'abortContro
      */
     runtimeParamsPayload?: RuntimeParamsTriggerPayloadType
     isRollbackTrigger?: boolean
+    strategy?: DeploymentStrategyType
 }
 
 export interface TriggerCDPipelinePayloadType
diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx
index 9fbf0d81f..38aec145d 100644
--- a/src/Shared/Components/Icon/Icon.tsx
+++ b/src/Shared/Components/Icon/Icon.tsx
@@ -48,7 +48,10 @@ import { ReactComponent as ICEcr } from '@IconsV2/ic-ecr.svg'
 import { ReactComponent as ICEnv } from '@IconsV2/ic-env.svg'
 import { ReactComponent as ICError } from '@IconsV2/ic-error.svg'
 import { ReactComponent as ICFailure } from '@IconsV2/ic-failure.svg'
+import { ReactComponent as ICFastForward } from '@IconsV2/ic-fast-forward.svg'
 import { ReactComponent as ICFileKey } from '@IconsV2/ic-file-key.svg'
+import { ReactComponent as ICFilter } from '@IconsV2/ic-filter.svg'
+import { ReactComponent as ICFilterApplied } from '@IconsV2/ic-filter-applied.svg'
 import { ReactComponent as ICFlask } from '@IconsV2/ic-flask.svg'
 import { ReactComponent as ICFolderUser } from '@IconsV2/ic-folder-user.svg'
 import { ReactComponent as ICGear } from '@IconsV2/ic-gear.svg'
@@ -75,11 +78,13 @@ import { ReactComponent as ICJobColor } from '@IconsV2/ic-job-color.svg'
 import { ReactComponent as ICK8sJob } from '@IconsV2/ic-k8s-job.svg'
 import { ReactComponent as ICKey } from '@IconsV2/ic-key.svg'
 import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg'
+import { ReactComponent as ICLego } from '@IconsV2/ic-lego.svg'
 import { ReactComponent as ICLightning } from '@IconsV2/ic-lightning.svg'
 import { ReactComponent as ICLightningFill } from '@IconsV2/ic-lightning-fill.svg'
 import { ReactComponent as ICLivspace } from '@IconsV2/ic-livspace.svg'
 import { ReactComponent as ICLoginDevtronLogo } from '@IconsV2/ic-login-devtron-logo.svg'
 import { ReactComponent as ICLogout } from '@IconsV2/ic-logout.svg'
+import { ReactComponent as ICMagnifyingGlass } from '@IconsV2/ic-magnifying-glass.svg'
 import { ReactComponent as ICMediumDelete } from '@IconsV2/ic-medium-delete.svg'
 import { ReactComponent as ICMediumPaintbucket } from '@IconsV2/ic-medium-paintbucket.svg'
 import { ReactComponent as ICMemory } from '@IconsV2/ic-memory.svg'
@@ -96,6 +101,7 @@ import { ReactComponent as ICOpenshift } from '@IconsV2/ic-openshift.svg'
 import { ReactComponent as ICOutOfSync } from '@IconsV2/ic-out-of-sync.svg'
 import { ReactComponent as ICPaperPlaneColor } from '@IconsV2/ic-paper-plane-color.svg'
 import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg'
+import { ReactComponent as ICPlayOutline } from '@IconsV2/ic-play-outline.svg'
 import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg'
 import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg'
 import { ReactComponent as ICRocketLaunch } from '@IconsV2/ic-rocket-launch.svg'
@@ -181,7 +187,10 @@ export const iconMap = {
     'ic-env': ICEnv,
     'ic-error': ICError,
     'ic-failure': ICFailure,
+    'ic-fast-forward': ICFastForward,
     'ic-file-key': ICFileKey,
+    'ic-filter-applied': ICFilterApplied,
+    'ic-filter': ICFilter,
     'ic-flask': ICFlask,
     'ic-folder-user': ICFolderUser,
     'ic-gear': ICGear,
@@ -208,11 +217,13 @@ export const iconMap = {
     'ic-k8s-job': ICK8sJob,
     'ic-key': ICKey,
     'ic-ldap': ICLdap,
+    'ic-lego': ICLego,
     'ic-lightning-fill': ICLightningFill,
     'ic-lightning': ICLightning,
     'ic-livspace': ICLivspace,
     'ic-login-devtron-logo': ICLoginDevtronLogo,
     'ic-logout': ICLogout,
+    'ic-magnifying-glass': ICMagnifyingGlass,
     'ic-medium-delete': ICMediumDelete,
     'ic-medium-paintbucket': ICMediumPaintbucket,
     'ic-memory': ICMemory,
@@ -229,6 +240,7 @@ export const iconMap = {
     'ic-out-of-sync': ICOutOfSync,
     'ic-paper-plane-color': ICPaperPlaneColor,
     'ic-pencil': ICPencil,
+    'ic-play-outline': ICPlayOutline,
     'ic-quay': ICQuay,
     'ic-quote': ICQuote,
     'ic-rocket-launch': ICRocketLaunch,
diff --git a/src/Shared/Components/LoadingCard.tsx b/src/Shared/Components/LoadingCard.tsx
new file mode 100644
index 000000000..c2e88e089
--- /dev/null
+++ b/src/Shared/Components/LoadingCard.tsx
@@ -0,0 +1,23 @@
+interface LoadingCardType {
+    wider?: boolean
+}
+
+const LoadingCard = ({ wider }: LoadingCardType) => (
+    <div
+        // TODO: Remove margin and use gap
+        className={`flexbox-col ${wider ? 'w-250' : 'w-200'} bg__primary border__secondary-translucent br-8 mr-16`}
+        style={{
+            boxShadow: '0px 0px 4px 0px rgba(0, 0, 0, 0.20)',
+        }}
+    >
+        <div className="flexbox-col dc__gap-8 px-12 pt-12 pb-8">
+            <span className="w-60 h-14 shimmer" />
+            <span className="w-120 h-18 shimmer" />
+        </div>
+        <div className="flexbox px-12 py-10 border__secondary--top">
+            <span className="w-44 h-14 shimmer" />
+        </div>
+    </div>
+)
+
+export default LoadingCard
diff --git a/src/Shared/Components/index.ts b/src/Shared/Components/index.ts
index abcb23727..fd86c73ba 100644
--- a/src/Shared/Components/index.ts
+++ b/src/Shared/Components/index.ts
@@ -72,6 +72,7 @@ export * from './InfoIconTippy'
 export * from './InvalidYAMLTippy'
 export * from './KeyValueTable'
 export * from './License'
+export { default as LoadingCard } from './LoadingCard'
 export * from './LoginBanner'
 export * from './MaterialHistory'
 export * from './ModalSidebarPanel'
diff --git a/src/Shared/types.ts b/src/Shared/types.ts
index de093cf87..fc7a57477 100644
--- a/src/Shared/types.ts
+++ b/src/Shared/types.ts
@@ -1161,3 +1161,5 @@ export interface IntelligenceConfig {
 }
 
 export type DeploymentStrategyType = 'CANARY' | 'ROLLING' | 'RECREATE' | 'BLUE-GREEN'
+
+export type DeploymentStrategyTypeWithDefault = DeploymentStrategyType | 'DEFAULT'