diff --git a/ethereum-testnet/Chart.yaml b/ethereum-testnet/Chart.yaml
index 867cf1e812951e4bf26417613be244369da5f87e..e353758d99735e20f7194dd67036442944df43fe 100644
--- a/ethereum-testnet/Chart.yaml
+++ b/ethereum-testnet/Chart.yaml
@@ -1,5 +1,5 @@
 name: ethereum-testnet
-version: 0.4.6
+version: 0.4.7
 description: Ethereum network Helm chart for Kubernetes
 keywords:
 - ethereum
diff --git a/ethereum-testnet/releases/dev/ethereum-testnet.yaml b/ethereum-testnet/releases/dev/ethereum-testnet.yaml
index 19fec3991e7758bac1ffa9680955555de25d2f07..b883ee6f5d89e6d902b07a5012c571d90d896049 100644
--- a/ethereum-testnet/releases/dev/ethereum-testnet.yaml
+++ b/ethereum-testnet/releases/dev/ethereum-testnet.yaml
@@ -1,12 +1,13 @@
 kind: HelmRelease
 metadata:
-  name: ethereum-testnet-jeet
-  namespace: ethereum-testnet-jeet
+  name: ethereum-testnet
+  namespace: ethereum-testnet
 spec:
   chart:
     name: ethereum-testnet
+    version: 0.4.7
   values:
-    # Default values for ethereum.
+    ## Default values for ethereum.
     # This is a YAML-formatted file.
     # Declare variables to be passed into your templates.
     imagePullPolicy: IfNotPresent
@@ -19,6 +20,11 @@ spec:
       # set the sync mode for rinkeby testnet.
       # archive, light, full, embedded
       mode: "full"
+    gateway:
+      selector:
+      - internal-gateway.default.svc.cluster.local
+      hosts:
+      - ethereum-testnet.dev-eu.nynja.net
     bootnode:
       image:
         repository: ethereum/client-go
@@ -36,7 +42,7 @@ spec:
         tag: v0.0.1
       ## generate sealed secret for webSocketSecret
       # webSocketSecret: my-secret-for-connecting-to-ethstats
-      webSocketSecret: "AgBMYHeMqxgdqcUVb5hiSWtGz12KEiBVr5DgUu6sSWbjikn2lkkYS7Hfo9+4FSCGF+VxOTn6pinkRK4Zhk21SsGdOBnhKJ6LatXlqN091dm3lQnpA60W3D2CXYIp4FMza7ze4+yYL8xU/kpPU9GFZd2rp6+Lm5KFbIpBfqMM2upiwLsNcqLjDIpxCyeztXFG5mbg8h9J4YzvHFdbqOgI4zM1IamjAgBPJYlzARLhynpyXQQ6FRqm+pYM19urKRrvqbzIciywvkuC2g9WkqwdeKemCUcTPLR6PYTGhK9jIITyvE0L/k610qIMkrPXv09xBOqZ9EAYQsUOUrG2he80jgsIQjF9WRk+ojPbOWyrs6CswPUO2nUDslPMpMqwXSPcW3Caxzy3L+JRt6Ddqp8WNgG4uf3oKDTpXNLwMEh7pykAwe77GxCu8BkkL0tARl/bEZmLXMKhDV3lwMUio4F3JSqISj1/JLJxLhu943hYOi2Q1ys6OCgNtbDQh9qIcvNUBrgYJY56BS2IMaHJlkE7iR8ktseEFq0VyUKlwCe+WSwWBZLY14d78iYlbJ6M2c5otVomLC6U+d6Rz2BYca6+fFnybF8yqbsUrAJg/LQ0x+tFVTEoy7RENlfgFNbHFlJIcuzFJ6Vip+Rd6bX08u2mybNM15Wd52D89Du1MLL6K3nUsxmZ4Dw/k/2kdvUXVQmm3jarkZAyG+SdyQ=="
+      webSocketSecret: "AgCZW6cKx41izNXzYZf39US5qDCDnxhd/1rvNnac8wb+xgQjkWXnzW3sNBNE4JZaNz+0zkk+0SjrgjERVBor729sKMyxxR90w9SmLW7gxkFot3hggv9T6FxZeOab9e4bSab88Tc9Z8TiPVioSsdxcOvbJwyzM5lkBB5QlPJs3vdqdCbFEUz7U+YyYRsF0WfpPkMFXpjHEe3Ds9t/ZAlaAx0iHpafKAZ8cNEA4UmNB2iukCEL+WJ5nWbfAzWmfMZUpY21HMxjmXqOJczABR9UsP3BOOKUgNu/lXqMepykwnH0g9KIgK6zuCd9QZtFqHmu8LJpNF6K4nHL2gUKKl8iGkcTChAO4Lgl+p1qzhwF4JtL+pgTBqTcfj9xxe7HTZIHmfJk29lz7+DNYZmj/69FCwxCarHeSYNe0+UYZsijVJ0aMtsaUO0tP8vACQAMO5/nEuaroLnyKnLtjGhjk42lxZwiQwV5PpHSm0Dsl4xznr/7mhE5hpRKCEOUWJqU812muhRpY9ymYz9QqC9c7IRsR64+DZI284B5MGCDIbBLjDECA6NFLHZLIvUWQ7aufUM80HKd1x6ne4Rew9Cwhey46w1h4een+rkqhgczFF2flKsIZxN7DeBNNeEpQgY0AKw5VDYQbC5qIxW5IQPF8yhayguD8r1Kgn/CiQ6X4ITjvtBl4Dc02GvylR+IkOMqmenQkhlyvG48BDc0dg=="
       service:
         #type: LoadBalancer
         type: ClusterIP
@@ -99,7 +105,7 @@ spec:
           # storageClass: "-"
           accessModes:
             - ReadWriteOnce
-          size: 50Gi
+          size: 100Gi
           annotations: {}
       # --verbosity value         Logging verbosity: 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=detail (default: 3)
       verbosity: 3
diff --git a/ethereum-testnet/releases/prod/ethereum-testnet.yaml b/ethereum-testnet/releases/prod/ethereum-testnet.yaml
index 3c37bc6019f213adcb5a3a3c4cd5e73fafc4867a..c77f3f47856541348c6107c18eaf996145aa2dbb 100644
--- a/ethereum-testnet/releases/prod/ethereum-testnet.yaml
+++ b/ethereum-testnet/releases/prod/ethereum-testnet.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   chart:
     name: ethereum
+    version: 0.4.7
   values:
     # Default values for ethereum.
     # This is a YAML-formatted file.
@@ -19,6 +20,11 @@ spec:
       # set the sync mode for rinkeby testnet.
       # archive, light, full, embedded
       mode: ""
+    gateway:
+      selector:
+      - internal-gateway.default.svc.cluster.local
+      hosts:
+      - ethereum-testnet.nynja.net
     bootnode:
       image:
         repository: ethereum/client-go
diff --git a/ethereum-testnet/releases/staging/ethereum-testnet.yaml b/ethereum-testnet/releases/staging/ethereum-testnet.yaml
index 727141d435de0c838f45e7304c95348c7a5db338..cb8548e710291b33fa869bc604af6724144a8424 100644
--- a/ethereum-testnet/releases/staging/ethereum-testnet.yaml
+++ b/ethereum-testnet/releases/staging/ethereum-testnet.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   chart:
     name: ethereum
+    version: 0.4.7
   values:
     # Default values for ethereum.
     # This is a YAML-formatted file.
@@ -19,6 +20,11 @@ spec:
       # set the sync mode for rinkeby testnet.
       # archive, light, full, embedded
       mode: ""
+    gateway:
+      selector:
+      - internal-gateway.default.svc.cluster.local
+      hosts:
+      - ethereum-testnet.staging.nynja.net
     bootnode:
       image:
         repository: ethereum/client-go
diff --git a/ethereum-testnet/templates/virtualservice.yaml b/ethereum-testnet/templates/virtualservice.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fcf60cd8e67251e6543298bc1724d0ccd5d87cb2
--- /dev/null
+++ b/ethereum-testnet/templates/virtualservice.yaml
@@ -0,0 +1,54 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: {{ template "ethereum.fullname" . }}-geth
+  labels:
+    app: {{ template "ethereum.name" . }}
+    chart: {{ template "ethereum.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    #component: geth-tx
+spec:
+  gateways:
+  {{- range .Values.gateway.selector }}
+  - {{ . }}
+  {{- end }}
+  hosts:
+  {{- range .Values.gateway.hosts }}
+  - {{ . }}
+  {{- end }}
+  tcp:
+  - match:
+    - uri:
+         prefix: "/rpc/"
+     rewrite:
+       uri: "/"
+    route:
+    - destination:
+        port:
+          number: 8545
+        host: {{ template "ethereum.fullname" . }}-geth-tx
+    timeout: 30s
+  - match:
+    -  uri:
+          prefix: "/wc/"
+    rewrite:
+      uri: "/"
+    route:
+    - destination:
+        port:
+          number: 8546
+        host: {{ template "ethereum.fullname" . }}-geth-tx
+    timeout: 30s
+  http:
+  - match:
+    - uri:
+         prefix: "/ethstats/"
+     rewrite:
+       uri: "/"
+    route:
+    - destination:
+        port:
+          number: 80
+        host: {{ template "ethereum.fullname" . }}-ethstats
+    timeout: 30s
\ No newline at end of file
diff --git a/ethereum-testnet/values.yaml b/ethereum-testnet/values.yaml
index f47d0596a2a6afcb4089748f1a5371d76f8bbb42..8c37a20d6dad9dfde7bccac368d3628757eb0d70 100644
--- a/ethereum-testnet/values.yaml
+++ b/ethereum-testnet/values.yaml
@@ -14,6 +14,12 @@ testnet:
   # archive, light, full, embedded
   mode: 
 
+gateway:
+  selector:
+  - internal-gateway.default.svc.cluster.local
+  hosts:
+  - ethereum-testnet-ethstat.dev-eu.nynja.net
+  
 bootnode:
   image:
     repository: ethereum/client-go
@@ -72,11 +78,6 @@ geth:
     # To allow the rpc modules, use --rpcapi=eth,net,web3
     # rpcModules: eth,net,web3,personal,miner,admin
     rpcModules: personal,admin,db,eth,net,web3,miner,shh,txpool,debug
-    # gateway:
-    #   selector:
-    #   - api-gateway.default.svc.cluster.local
-    #   hosts:
-    #   - ethereum-testnet.dev-eu.nynja.net
     resources:
       limits:
         cpu: 50m