diff --git a/applications/argocd/production/applications/alert-hub-backend.yaml b/applications/argocd/production/applications/alert-hub-backend.yaml
index 5bb29d8..820d736 100644
--- a/applications/argocd/production/applications/alert-hub-backend.yaml
+++ b/applications/argocd/production/applications/alert-hub-backend.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo
     chart: ifrcgo-alert-hub-helm
-    targetRevision: 0.1.1-develop.ca9d3c81
+    targetRevision: 0.1.1-develop.c6f10f53
     helm:
       valueFiles:
         - values-go-deploy.yaml
@@ -44,14 +44,6 @@ spec:
               clientID: "5853dc85-0d06-4f6d-9145-c72680a65ad9"
               keyvaultName: "alert-hub-production-kv"
               tenantId: "a2b53be5-734e-4e6c-ab0d-d184f60fd917"
-          # App level configs - temporary
-          api:
-            replicaCount: 2
-            resources:
-              requests:
-                memory: 2Gi
-              limits:
-                memory: 2Gi
   destination:
     server: https://kubernetes.default.svc
     namespace: alert-hub
diff --git a/applications/argocd/production/applications/alert-hub-frontend.yaml b/applications/argocd/production/applications/alert-hub-frontend.yaml
index c0505d5..439c2d1 100644
--- a/applications/argocd/production/applications/alert-hub-frontend.yaml
+++ b/applications/argocd/production/applications/alert-hub-frontend.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo/alert-hub-web-app
     chart: ifrcgo-web-app-nginx-serve
-    targetRevision: 0.0.1-develop.218124b
+    targetRevision: 0.0.1-develop.6a791e5
     helm:
       parameters:
         - name: ingress.host
diff --git a/applications/argocd/production/applications/montandon-eoapi/application.yaml b/applications/argocd/production/applications/montandon-eoapi/application.yaml
index b8ad213..b2dc239 100644
--- a/applications/argocd/production/applications/montandon-eoapi/application.yaml
+++ b/applications/argocd/production/applications/montandon-eoapi/application.yaml
@@ -60,7 +60,7 @@ spec:
             resources:
               requests:
                 memory: "2048Mi"
-                cpu: "500m"
+                cpu: "10m"
               limits:
                 memory: "4096Mi"
                 cpu: "1000m"
diff --git a/applications/argocd/production/applications/risk-module.yaml b/applications/argocd/production/applications/risk-module.yaml
index 8cab744..3f8e2cc 100644
--- a/applications/argocd/production/applications/risk-module.yaml
+++ b/applications/argocd/production/applications/risk-module.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo
     chart: ifrcgo-risk-module-helm
-    targetRevision: 0.0.1-develop.cf300c49
+    targetRevision: 0.0.1-develop.c0c63878
     helm:
       valueFiles:
         - values/operators.yaml
diff --git a/applications/argocd/staging/applications/alert-hub-backend.yaml b/applications/argocd/staging/applications/alert-hub-backend.yaml
index c869fbf..fd5de0c 100644
--- a/applications/argocd/staging/applications/alert-hub-backend.yaml
+++ b/applications/argocd/staging/applications/alert-hub-backend.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo
     chart: ifrcgo-alert-hub-helm
-    targetRevision: 0.1.1-develop.ca9d3c81
+    targetRevision: 0.1.1-develop.c6f10f53
     helm:
       valueFiles:
         - values-go-deploy.yaml
diff --git a/applications/argocd/staging/applications/alert-hub-frontend.yaml b/applications/argocd/staging/applications/alert-hub-frontend.yaml
index 8f698ac..a831356 100644
--- a/applications/argocd/staging/applications/alert-hub-frontend.yaml
+++ b/applications/argocd/staging/applications/alert-hub-frontend.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo/alert-hub-web-app
     chart: ifrcgo-web-app-nginx-serve
-    targetRevision: 0.0.1-develop.990c96d
+    targetRevision: 0.0.1-develop.6a791e5
     helm:
       parameters:
         - name: ingress.host
diff --git a/applications/argocd/staging/applications/montandon-eoapi/application.yaml b/applications/argocd/staging/applications/montandon-eoapi/application.yaml
index 198b5d3..574c9b0 100644
--- a/applications/argocd/staging/applications/montandon-eoapi/application.yaml
+++ b/applications/argocd/staging/applications/montandon-eoapi/application.yaml
@@ -60,7 +60,7 @@ spec:
             resources:
               requests:
                 memory: "2048Mi"
-                cpu: "500m"
+                cpu: "10m"
               limits:
                 memory: "4096Mi"
                 cpu: "1000m"
diff --git a/applications/argocd/staging/applications/risk-module.yaml b/applications/argocd/staging/applications/risk-module.yaml
index 96582c5..044aa8e 100644
--- a/applications/argocd/staging/applications/risk-module.yaml
+++ b/applications/argocd/staging/applications/risk-module.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: ghcr.io/ifrcgo
     chart: ifrcgo-risk-module-helm
-    targetRevision: 0.0.1-develop.cf300c49
+    targetRevision: 0.0.1-develop.c0c63878
     helm:
       valueFiles:
         - values/operators.yaml
diff --git a/applications/go-api/azure-pipelines.yaml b/applications/go-api/azure-pipelines.yaml
index 7835a52..db20d1e 100644
--- a/applications/go-api/azure-pipelines.yaml
+++ b/applications/go-api/azure-pipelines.yaml
@@ -32,7 +32,7 @@ jobs:
     displayName: "Deploy staging instance of go-api"
     env:
       ENVIRONMENT: staging
-      VERSION: "0.0.2-develop.c038d7f8"
+      VERSION: "0.0.2-develop.c05d5fea"
       # For Azure CLI
       AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
       AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
@@ -120,7 +120,7 @@ jobs:
     displayName: "Deploy production instance of go-api"
     env:
       ENVIRONMENT: production
-      VERSION: "0.0.2-master.ce40be9f"
+      VERSION: "0.0.2-master.c02bae97"
       # For Azure CLI
       AZURE_TENANT_ID: $(TERRAFORM_TENANT_ID)
       AZURE_CLIENT_ID: $(TERRAFORM_SERVICE_PRINCIPAL_ID)
diff --git a/applications/go-api/helm/ifrcgo-helm/values-production.yaml b/applications/go-api/helm/ifrcgo-helm/values-production.yaml
index 8b34534..b89f19c 100644
--- a/applications/go-api/helm/ifrcgo-helm/values-production.yaml
+++ b/applications/go-api/helm/ifrcgo-helm/values-production.yaml
@@ -28,7 +28,7 @@ api:
   replicaCount: 2
   resources:
     requests:
-      cpu: "1"
+      cpu: "0.2"
       memory: 4Gi
     limits:
       cpu: "2"
@@ -49,7 +49,7 @@ celery:
   replicaCount: 2
   resources:
     requests:
-      cpu: "0.5"
+      cpu: "0.2"
       memory: 0.4Gi
     limits:
       cpu: "2"
@@ -60,7 +60,7 @@ elasticsearch:
     uri: /subscriptions/39308fb0-9929-4b29-aafa-b3c78a8b0658/resourceGroups/ifrcpgo002rg/providers/Microsoft.Compute/disks/ifrcpgo-disk001
   resources:
     requests:
-      cpu: "1"
+      cpu: "0.2"
       memory: 4Gi
     limits:
       cpu: "2"
@@ -72,7 +72,7 @@ sshBastion:
       cpu: "0.1"
       memory: 0.05Gi
     limits:
-      cpu: "0.5"
+      cpu: "1"
       memory: 0.2Gi
 
 serviceAccount:
diff --git a/applications/go-api/helm/ifrcgo-helm/values-staging.yaml b/applications/go-api/helm/ifrcgo-helm/values-staging.yaml
index da1fd17..fb30545 100644
--- a/applications/go-api/helm/ifrcgo-helm/values-staging.yaml
+++ b/applications/go-api/helm/ifrcgo-helm/values-staging.yaml
@@ -28,7 +28,7 @@ api:
   replicaCount: 1
   resources:
     requests:
-      cpu: "0.5"
+      cpu: "0.2"
       memory: 4Gi
     limits:
       cpu: "2"
@@ -39,7 +39,7 @@ redis:
     repository: bitnamilegacy/redis
   resources:
     requests:
-      cpu: "0.1"
+      cpu: "0.2"
       memory: 0.5Gi
     limits:
       cpu: "1"
@@ -49,7 +49,7 @@ celery:
   replicaCount: 1
   resources:
     requests:
-      cpu: "0.1"
+      cpu: "0.2"
       memory: 0.4Gi
     limits:
       cpu: "2"
@@ -60,7 +60,7 @@ elasticsearch:
     uri: /subscriptions/39308fb0-9929-4b29-aafa-b3c78a8b0658/resourceGroups/ifrctgo002rg/providers/Microsoft.Compute/disks/ifrctgo-disk001
   resources:
     requests:
-      cpu: "0.5"
+      cpu: "0.2"
       memory: 4Gi
     limits:
       cpu: "2"
@@ -69,10 +69,10 @@ elasticsearch:
 sshBastion:
   resources:
     requests:
-      cpu: "0.1"
+      cpu: "0.2"
       memory: 0.05Gi
     limits:
-      cpu: "0.5"
+      cpu: "1"
       memory: 0.2Gi
 
 serviceAccount: