diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml
index 208f38f..b7248b2 100644
--- a/charts/pulsar/values.yaml
+++ b/charts/pulsar/values.yaml
@@ -124,34 +124,34 @@ extra:
 images:
   zookeeper:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
     pullPolicy: IfNotPresent
   bookie:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
     pullPolicy: IfNotPresent
   autorecovery:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
     pullPolicy: IfNotPresent
   broker:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
     pullPolicy: IfNotPresent
   proxy:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
     pullPolicy: IfNotPresent
   functions:
     repository: apachepulsar/pulsar-all
-    tag: 2.5.0
+    tag: 2.6.0
   prometheus:
     repository: prom/prometheus
     tag: v2.17.2
     pullPolicy: IfNotPresent
   grafana:
     repository: streamnative/apache-pulsar-grafana-dashboard-k8s
-    tag: 0.0.6
+    tag: 0.0.8
     pullPolicy: IfNotPresent
   pulsar_manager:
     repository: apachepulsar/pulsar-manager
@@ -310,8 +310,10 @@ zookeeper:
   ##
   configData:
     PULSAR_MEM: >
-      "
       -Xms64m -Xmx128m
+    PULSAR_GC: >
+      -XX:+UseG1GC
+      -XX:MaxGCPauseMillis=10
       -Dcom.sun.management.jmxremote
       -Djute.maxbuffer=10485760
       -XX:+ParallelRefProcEnabled
@@ -320,12 +322,6 @@ zookeeper:
       -XX:+DisableExplicitGC
       -XX:+PerfDisableSharedMem
       -Dzookeeper.forceSync=no
-      "
-    PULSAR_GC: >
-      "
-      -XX:+UseG1GC
-      -XX:MaxGCPauseMillis=10
-      "
   ## Zookeeper service
   ## templates/zookeeper-service.yaml
   ##
@@ -431,22 +427,12 @@ bookkeeper:
   ## templates/bookkeeper-configmap.yaml
   ##
   configData:
-    # `BOOKIE_MEM` is used for `bookie shell`
-    BOOKIE_MEM: >
-      "
-      -Xms128m
-      -Xmx256m
-      -XX:MaxDirectMemorySize=256m
-      "
     # we use `bin/pulsar` for starting bookie daemons
     PULSAR_MEM: >
-      "
       -Xms128m
       -Xmx256m
       -XX:MaxDirectMemorySize=256m
-      "
     PULSAR_GC: >
-      "
       -XX:+UseG1GC
       -XX:MaxGCPauseMillis=10
       -XX:+ParallelRefProcEnabled
@@ -466,7 +452,6 @@ bookkeeper:
       -verbosegc
       -Xloggc:/var/log/bookie-gc.log
       -XX:G1LogLevel=finest
-      "
     # configure the memory settings based on jvm memory settings
     dbStorage_writeCacheMaxSizeMb: "32"
     dbStorage_readAheadCacheMaxSizeMb: "32"
@@ -577,8 +562,10 @@ broker:
   ##
   configData:
     PULSAR_MEM: >
-      "
       -Xms128m -Xmx256m -XX:MaxDirectMemorySize=256m
+    PULSAR_GC: >
+      -XX:+UseG1GC
+      -XX:MaxGCPauseMillis=10
       -Dio.netty.leakDetectionLevel=disabled
       -Dio.netty.recycler.linkCapacity=1024
       -XX:+ParallelRefProcEnabled
@@ -591,12 +578,6 @@ broker:
       -XX:-ResizePLAB
       -XX:+ExitOnOutOfMemoryError
       -XX:+PerfDisableSharedMem
-      "
-    PULSAR_GC: >
-      "
-      -XX:+UseG1GC
-      -XX:MaxGCPauseMillis=10
-      "
     managedLedgerDefaultEnsembleSize: "2"
     managedLedgerDefaultWriteQuorum: "2"
     managedLedgerDefaultAckQuorum: "2"
@@ -658,8 +639,10 @@ proxy:
   ##
   configData:
     PULSAR_MEM: >
-      "
       -Xms64m -Xmx64m -XX:MaxDirectMemorySize=64m
+    PULSAR_GC: >
+      -XX:+UseG1GC
+      -XX:MaxGCPauseMillis=10
       -Dio.netty.leakDetectionLevel=disabled
       -Dio.netty.recycler.linkCapacity=1024
       -XX:+ParallelRefProcEnabled
@@ -672,12 +655,6 @@ proxy:
       -XX:-ResizePLAB
       -XX:+ExitOnOutOfMemoryError
       -XX:+PerfDisableSharedMem
-      "
-    PULSAR_GC: >
-      "
-      -XX:+UseG1GC
-      -XX:MaxGCPauseMillis=10
-      "
   ## Proxy service
   ## templates/proxy-service.yaml
   ##
@@ -760,11 +737,9 @@ toolset:
   ##
   configData:
     PULSAR_MEM: >
-      "
       -Xms64M
       -Xmx128M
       -XX:MaxDirectMemorySize=128M
-      "
 
 #############################################################
 ### Monitoring Stack : Prometheus / Grafana