diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 87e252a8..2859057a 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.5
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.11.1
+version: 3.11.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
+    - "[Fix]: Set type of service for grpc as NodePort because this is the default of ALB ingress Controller"
diff --git a/charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml b/charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml
index 018bca3e..acc9dd60 100644
--- a/charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml
+++ b/charts/argo-cd/templates/argocd-server/alb-grpc-service.yaml
@@ -20,5 +20,5 @@ spec:
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
   sessionAffinity: None
-  type: ClusterIP
+  type: NodePort
 {{- end -}}
diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 87877d92..1dc04116 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -47,3 +47,6 @@ spec:
 {{- with .Values.server.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ . }}
 {{- end }}
+{{- with .Values.server.service.sessionAffinity }}
+  sessionAffinity: {{ . }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 06232342..8ffcdaea 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -541,6 +541,7 @@ server:
     loadBalancerSourceRanges: []
     externalIPs: []
     externalTrafficPolicy: ""
+    sessionAffinity: ""
 
   ## Server metrics service configuration
   metrics:
diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 835705bf..c29777c7 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.6.4
+version: 1.7.0
 keywords:
   - argo-events
   - sensor-controller
@@ -13,8 +13,9 @@ maintainers:
   - name: VaibhavPage
   - name: whynowy
 appVersion: 1.3.1
-icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
+icon: https://argoproj.github.io/argo-events/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Initialize Changelog"
+    - "[Added]: Ability to specify additional/custom environment variables"
+    - "[Fixed]: Charts icon url"
diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index 591d8da3..747bfc11 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -36,6 +36,9 @@ spec:
             - --namespaced
           {{- end }}
           env:
+          {{- with .Values.eventbusController.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
             - name: NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 62fe150e..651ff39b 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -36,6 +36,9 @@ spec:
             - --namespaced
           {{- end }}
           env:
+          {{- with .Values.eventsourceController.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
             - name: NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 0b51d1de..6c2f6a04 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -36,6 +36,9 @@ spec:
             - --namespaced
           {{- end }}
           env:
+          {{- with .Values.sensorController.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
             - name: NAMESPACE
               valueFrom:
                 fieldRef:
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 11827406..db6f679d 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -47,6 +47,9 @@ sensorController:
   image: argoproj/sensor-controller
   tag: v1.3.1
   replicaCount: 1
+  extraEnv: []
+    # - name: DEBUG_LOG
+    #   value: "true"
   sensorImage: argoproj/sensor
   podAnnotations: {}
   nodeSelector: {}
@@ -61,6 +64,9 @@ eventsourceController:
   image: argoproj/eventsource-controller
   tag: v1.3.1
   replicaCount: 1
+  extraEnv: []
+    # - name: DEBUG_LOG
+    #   value: "true"
   eventsourceImage: argoproj/eventsource
   podAnnotations: {}
   nodeSelector: {}
@@ -75,6 +81,9 @@ eventbusController:
   image: argoproj/eventbus-controller
   tag: v1.3.1
   replicaCount: 1
+  extraEnv: []
+    # - name: DEBUG_LOG
+    #   value: "true"
   podAnnotations: {}
   nodeSelector: {}
   podLabels: {}