diff --git a/.harness/newPipeline.yaml b/.harness/newPipeline.yaml
new file mode 100644
index 000000000000..5205ac0f2dc6
--- /dev/null
+++ b/.harness/newPipeline.yaml
@@ -0,0 +1,33 @@
+pipeline:
+  name: newPipeline
+  identifier: newPipeline
+  projectIdentifier: Test
+  orgIdentifier: default
+  tags: {}
+  stages:
+    - stage:
+        name: Build
+        identifier: Build
+        description: ""
+        type: CI
+        spec:
+          cloneCodebase: false
+          infrastructure:
+            type: KubernetesDirect
+            spec:
+              connectorRef: ShobhitK8
+              namespace: harness-delegate-ng
+              automountServiceAccountToken: true
+              nodeSelector: {}
+              os: Linux
+          execution:
+            steps:
+              - step:
+                  type: Run
+                  name: Run_1
+                  identifier: Run_1
+                  spec:
+                    connectorRef: account.harnessImage
+                    image: alpine
+                    shell: Sh
+                    command: echo hello
diff --git a/.harness/newRemote.yaml b/.harness/newRemote.yaml
new file mode 100644
index 000000000000..1d0ffbc98b9a
--- /dev/null
+++ b/.harness/newRemote.yaml
@@ -0,0 +1,33 @@
+pipeline:
+  name: newRemote
+  identifier: newRemote
+  projectIdentifier: Test
+  orgIdentifier: default
+  tags: {}
+  stages:
+    - stage:
+        name: build
+        identifier: build
+        description: ""
+        type: CI
+        spec:
+          cloneCodebase: false
+          infrastructure:
+            type: KubernetesDirect
+            spec:
+              connectorRef: ShobhitK8
+              namespace: harness-delegate-ng
+              automountServiceAccountToken: true
+              nodeSelector: {}
+              os: Linux
+          execution:
+            steps:
+              - step:
+                  type: Run
+                  name: Run_1
+                  identifier: Run_1
+                  spec:
+                    connectorRef: account.harnessImage
+                    image: alpine
+                    shell: Sh
+                    command: echo hello
diff --git a/.harness/remotePipeline.yaml b/.harness/remotePipeline.yaml
new file mode 100644
index 000000000000..1cde7cf331bb
--- /dev/null
+++ b/.harness/remotePipeline.yaml
@@ -0,0 +1,33 @@
+pipeline:
+  name: remotePipeline
+  identifier: remotePipeline
+  projectIdentifier: Test
+  orgIdentifier: default
+  tags: {}
+  stages:
+    - stage:
+        name: build
+        identifier: build
+        description: ""
+        type: CI
+        spec:
+          cloneCodebase: false
+          infrastructure:
+            type: KubernetesDirect
+            spec:
+              connectorRef: ShobhitK8
+              namespace: harness-ng-delegate
+              automountServiceAccountToken: true
+              nodeSelector: {}
+              os: Linux
+          execution:
+            steps:
+              - step:
+                  type: Run
+                  name: Run_1
+                  identifier: Run_1
+                  spec:
+                    connectorRef: account.harnessImage
+                    image: alpine
+                    shell: Sh
+                    command: echo hello
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d9999fbb7e0d..57f2b23b8b3d 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -28,6 +28,9 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index c2f959bed0c7..79ee123c2b23 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
   </state>
-</component>
+</component>
\ No newline at end of file
diff --git a/955-cg-yaml/src/main/java/software/wings/beans/InfraMappingYaml.java b/955-cg-yaml/src/main/java/software/wings/beans/InfraMappingYaml.java
index 4966cedf255c..29e0b40461ce 100644
--- a/955-cg-yaml/src/main/java/software/wings/beans/InfraMappingYaml.java
+++ b/955-cg-yaml/src/main/java/software/wings/beans/InfraMappingYaml.java
@@ -4,9 +4,7 @@
  * that can be found in the licenses directory at the root of this repository, also available at
  * https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt.
  */
-
 package software.wings.beans;
-
 import static io.harness.annotations.dev.HarnessTeam.CDP;
 
 import io.harness.annotations.dev.OwnedBy;
@@ -26,6 +24,7 @@ public abstract class InfraMappingYaml extends BaseEntityYaml {
   private String serviceName;
   private String infraMappingType;
   private String deploymentType;
+  //private Map<String, Object> blueprints;
   private Map<String, Object> blueprints;
 
   public InfraMappingYaml(String type, String harnessApiVersion, String serviceName, String infraMappingType,
diff --git a/959-file-service-commons/src/main/java/io/harness/delegate/beans/FileBucket.java b/959-file-service-commons/src/main/java/io/harness/delegate/beans/FileBucket.java
index 22361eba1f81..f3860087c221 100644
--- a/959-file-service-commons/src/main/java/io/harness/delegate/beans/FileBucket.java
+++ b/959-file-service-commons/src/main/java/io/harness/delegate/beans/FileBucket.java
@@ -46,6 +46,7 @@ public enum FileBucket {
    * Instantiates a new file bucket.
    */
   FileBucket() {
+    //this(1000 * 1000);
     this(1000 * 1000);
   }
 
diff --git a/960-api-services/src/main/java/io/harness/manifest/request/ManifestRequest.java b/960-api-services/src/main/java/io/harness/manifest/request/ManifestRequest.java
index 325f095dcaee..10e769dcdeb6 100644
--- a/960-api-services/src/main/java/io/harness/manifest/request/ManifestRequest.java
+++ b/960-api-services/src/main/java/io/harness/manifest/request/ManifestRequest.java
@@ -9,6 +9,7 @@
 
 import java.util.List;
 import lombok.AllArgsConstructor;
+// import lombok.Getter;
 import lombok.Getter;
 
 @Getter