diff --git a/argocd-definitions/dev/app.express.yaml b/argocd-definitions/dev/app.express.yaml
index befe006..024e84f 100644
--- a/argocd-definitions/dev/app.express.yaml
+++ b/argocd-definitions/dev/app.express.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: express-dev
-  namespace: codefresh
   labels:
     app: express-dev
   finalizers:
@@ -10,14 +9,15 @@ metadata:
 spec:
   destination:
     namespace: express-dev
-    name: CLUSTER_NAME
-  project: express
+    name: docker-ngrok
+  project: default
   source:
     path: ./k8s-resources/express/overlays/dev
-    repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
+    repoURL: https://github.com/nightmar39/cd-five-mins.git
     targetRevision: main
   syncPolicy:
     syncOptions:
       - CreateNamespace=true
     automated:
       prune: true
+      selfHeal: true
diff --git a/argocd-definitions/dev/app.nginx-pod.yaml b/argocd-definitions/dev/app.nginx-pod.yaml
index b882b8b..b96b464 100644
--- a/argocd-definitions/dev/app.nginx-pod.yaml
+++ b/argocd-definitions/dev/app.nginx-pod.yaml
@@ -2,18 +2,17 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: nginx-pod-dev
-  namespace: codefresh
   labels:
     app: nginx-pod-dev
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
+  project: default
   destination:
     namespace: nginx-pod-dev
-    name: CLUSTER_NAME
-  project: nginx-pod
+    name: docker-ngrok
   source:
-    repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
+    repoURL: https://github.com/nightmar39/cd-five-mins.git
     targetRevision: main
     path: ./k8s-resources/nginx-pod/dev
   syncPolicy:
diff --git a/argocd-definitions/dev/app.trio.yaml b/argocd-definitions/dev/app.trio.yaml
index d3259a6..9bfe197 100644
--- a/argocd-definitions/dev/app.trio.yaml
+++ b/argocd-definitions/dev/app.trio.yaml
@@ -2,18 +2,17 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: trio-dev
-  namespace: codefresh
   labels:
     app: trio-dev
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
+  project: default
   destination:
     namespace: trio-dev
-    name: CLUSTER_NAME
-  project: trio
+    name: docker-ngrok
   source:
-    repoURL: https://github.com/GITHUB_USER/GITHUB_REPO.git
+    repoURL: https://github.com/nightmar39/cd-five-mins.git
     targetRevision: main
     path: ./k8s-resources/trio/dev
     helm:
diff --git a/argocd-definitions/dev/project.express.yaml b/argocd-definitions/dev/project.express.yaml
deleted file mode 100644
index 24c1c32..0000000
--- a/argocd-definitions/dev/project.express.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: express
-  namespace: codefresh
-  # Finalizer that ensures that project is not deleted until it is not referenced by any application
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  # Project description
-  description: Deployment(s) of 'express' app
-
-  # Allow manifests to deploy from any Git repos
-  sourceRepos:
-  - '*'
-
-  # Permit applications to deploy to any namespace in any cluster
-  destinations:
-  - namespace: '*'
-    server: '*'
-
-  # Permit cluster-scoped resources to be created
-  clusterResourceWhitelist:
-  - group: '*'
-    kind: '*'
-
-  namespaceResourceWhitelist:
-  - group: '*'
-    kind: '*'
diff --git a/argocd-definitions/dev/project.nginx-pod.yaml b/argocd-definitions/dev/project.nginx-pod.yaml
deleted file mode 100644
index f38128d..0000000
--- a/argocd-definitions/dev/project.nginx-pod.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: nginx-pod
-  namespace: codefresh
-  # Finalizer that ensures that project is not deleted until it is not referenced by any application
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  # Project description
-  description: Deployment(s) of 'nginx-pod' app
-
-  # Allow manifests to deploy from any Git repos
-  sourceRepos:
-  - '*'
-
-  # Permit applications to deploy to any namespace in any cluster
-  destinations:
-  - namespace: '*'
-    server: '*'
-
-  # Permit cluster-scoped resources to be created
-  clusterResourceWhitelist:
-  - group: '*'
-    kind: '*'
-
-  namespaceResourceWhitelist:
-  - group: '*'
-    kind: '*'
diff --git a/argocd-definitions/dev/project.trio.yaml b/argocd-definitions/dev/project.trio.yaml
deleted file mode 100644
index afbd392..0000000
--- a/argocd-definitions/dev/project.trio.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: trio
-  namespace: codefresh
-  # Finalizer that ensures that project is not deleted until it is not referenced by any application
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  # Project description
-  description: Deployment(s) of 'trio' app
-
-  # Allow manifests to deploy from any Git repos
-  sourceRepos:
-  - '*'
-
-  # Permit applications to deploy to any namespace in any cluster
-  destinations:
-  - namespace: '*'
-    server: '*'
-
-  # Permit cluster-scoped resources to be created
-  clusterResourceWhitelist:
-  - group: '*'
-    kind: '*'
-
-  namespaceResourceWhitelist:
-  - group: '*'
-    kind: '*'
diff --git a/k8s-resources/express/base/deployment.yaml b/k8s-resources/express/base/deployment.yaml
index 1b1b452..245a8af 100644
--- a/k8s-resources/express/base/deployment.yaml
+++ b/k8s-resources/express/base/deployment.yaml
@@ -1,10 +1,9 @@
-apiVersion: argoproj.io/v1alpha1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: express-microservice
-  namespace: codefresh
 spec:
-  replicas: 4
+  replicas: 3
   # revisionHistoryLimit>2 not supported right now
   revisionHistoryLimit: 2 
   selector:
diff --git a/k8s-resources/express/base/service.yaml b/k8s-resources/express/base/service.yaml
index e554490..e1f0386 100644
--- a/k8s-resources/express/base/service.yaml
+++ b/k8s-resources/express/base/service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: express-active
-  namespace: codefresh
 spec:
   ports:
   - port: 80
diff --git a/k8s-resources/express/overlays/dev/kustomization.yaml b/k8s-resources/express/overlays/dev/kustomization.yaml
index cf7a1fa..2c14b4d 100644
--- a/k8s-resources/express/overlays/dev/kustomization.yaml
+++ b/k8s-resources/express/overlays/dev/kustomization.yaml
@@ -6,3 +6,6 @@ resources:
 images:
   - name: quay.io/codefresh_sa/express
     newTag: "5416e81"
+replicas:
+- name: express-microservice
+  count: 2
diff --git a/k8s-resources/nginx-pod/nginx-pod.yaml b/k8s-resources/nginx-pod/dev/nginx-pod.yaml
similarity index 64%
rename from k8s-resources/nginx-pod/nginx-pod.yaml
rename to k8s-resources/nginx-pod/dev/nginx-pod.yaml
index 2503f09..00b8aee 100644
--- a/k8s-resources/nginx-pod/nginx-pod.yaml
+++ b/k8s-resources/nginx-pod/dev/nginx-pod.yaml
@@ -1,11 +1,10 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: webserver
-  namespace: codefresh
+  name: webserver-nginx
 spec:
   containers:
-  - name: webserver
+  - name: webserver-nginx
     image: nginx:latest
     ports:
     - containerPort: 80
\ No newline at end of file
diff --git a/k8s-resources/trio/dev/values.yaml b/k8s-resources/trio/dev/values.yaml
index 22a63d9..b8616be 100644
--- a/k8s-resources/trio/dev/values.yaml
+++ b/k8s-resources/trio/dev/values.yaml
@@ -4,12 +4,12 @@ buslog:
     repository: quay.io/codefresh_sa/buslog
     tag: "4ed1e59"
 ctrlr:
-  replicaCount: 2
+  replicaCount: 1
   image:
     repository: quay.io/codefresh_sa/ctrlr
     tag: "2b6d88e"
 flask-ui:
-  replicaCount: 3
+  replicaCount: 2
   image:
     repository: quay.io/codefresh_sa/flask-ui
     tag: "1b8d478"
diff --git a/push/update-git-info-linux.sh b/push/update-git-info-linux.sh
new file mode 100755
index 0000000..5186038
--- /dev/null
+++ b/push/update-git-info-linux.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+echo "Enter git user name" 
+
+read GIT_USER
+
+echo "Enter git repo name"
+
+read GIT_REPO
+
+echo "Enter Managed Cluster name"
+
+read MANAGED_CLUSTER
+
+for i in ../argocd-definitions/dev/app*; do 
+	sed -i -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i
+done 
+
+git add ./argocd-definitions/dev/app*
+
+git branch -M hosted-demo
+
+git commit -m "Update GITHUB_USER, GITHUB_REPO and CLUSTER_NAME"
+
+git push -u origin hosted-demo
+
diff --git a/push/update-git-info-mac.sh b/push/update-git-info-mac.sh
new file mode 100755
index 0000000..c2e40c4
--- /dev/null
+++ b/push/update-git-info-mac.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+echo "Enter git user name" 
+
+read GIT_USER
+
+echo "Enter git repo name"
+
+read GIT_REPO
+
+echo "Enter the name of your managed cluster"
+
+read MANAGED_CLUSTER
+
+for i in ./argocd-definitions/dev/app*; do 
+	sed -i '' -e "s/GITHUB_USER/$GIT_USER/" -e "s/GITHUB_REPO/$GIT_REPO/" -e "s/CLUSTER_NAME/$MANAGED_CLUSTER/" $i
+done 
+
+git add ./argocd-definitions/dev/app*
+
+git branch -M hosted-demo
+
+git commit -m "Update GITHUB_USER and GITHUB_REPO"
+
+git push -u origin hosted-demo
+