diff --git a/dailynet/faucet_values.yaml b/dailynet/faucet_values.yaml
index 5c3b634b..483f2b38 100644
--- a/dailynet/faucet_values.yaml
+++ b/dailynet/faucet_values.yaml
@@ -1,6 +1,6 @@
 images:
-  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:pow
-  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:pow
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.0.0
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.0.0
 
 # Frontend app configuration. You can optionally deploy only the faucet backend.
 enableUI: true
diff --git a/ghostnet/faucet_values.yaml b/ghostnet/faucet_values.yaml
index 424ff50e..4dd8e748 100644
--- a/ghostnet/faucet_values.yaml
+++ b/ghostnet/faucet_values.yaml
@@ -1,30 +1,32 @@
 images:
-  tezos_faucet: ghcr.io/oxheadalpha/tezos-faucet:1.1.0
-  tezos_faucet_backend: ghcr.io/oxheadalpha/tezos-faucet-backend:1.1
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.0.0
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.0.0
+
 authorizedHost: # filled in by pulumi
 maxBalance: 10000
+
 config:
   application:
-     name: "Tezos Ghostnet faucet"
-     googleCaptchaSiteKey: #filled in by pulumi
-     backendUrl: # filled in by pulumi
-     githubRepo: "https://github.com/avysel/tezos-faucet"
-     profiles:
-       user:
-         profile: USER
-         amount: 100
-       baker:
-         profile: BAKER
-         amount: 2001
+    name: "Tezos Ghostnet faucet"
+    googleCaptchaSiteKey: #filled in by pulumi
+    backendUrl: # filled in by pulumi
+    githubRepo: "https://github.com/avysel/tezos-faucet"
   network:
-     name: # filled in by pulumi
-     rpcUrl: # filled in by pulumi
-     faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
-     viewer: https://ghost.tzstats.com
-     allowSendButton: false
+    name: # filled in by pulumi
+    rpcUrl: # filled in by pulumi
+    faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
+    viewer: https://ghost.tzstats.com
+
+profiles:
+  user:
+    amount: 100
+  baker:
+    amount: 2001
+
 ingress:
   enabled: true
   annotations:
     "kubernetes.io/ingress.class": "nginx"
-    'cert-manager.io/cluster-issuer': "letsencrypt-prod"
+    "cert-manager.io/cluster-issuer": "letsencrypt-prod"
   host: # faucet fqdn, filled in by pulumi
+
diff --git a/index.ts b/index.ts
index 6832794c..d2085c06 100644
--- a/index.ts
+++ b/index.ts
@@ -188,11 +188,11 @@ new TezosChain(
     name: "ghostnet",
     dnsName: "ghostnet",
     humanName: "Ghostnet",
-    chartRepoVersion: "6.20.2",
+    chartRepoVersion: "6.22.0",
   }),
   cluster.provider,
   repo,
-  teztnetsHostedZone,
+  teztnetsHostedZone
 )
 
 const nairobinet_chain = new TezosChain(
@@ -208,7 +208,7 @@ const nairobinet_chain = new TezosChain(
     humanName: "Nairobinet",
     description: "Test Chain for the Nairobi Protocol Proposal",
     bootstrapPeers: ["nairobinet.boot.ecadinfra.com", "nairobinet.tzboot.net"],
-    chartRepoVersion: "6.21.0",
+    chartRepoVersion: "6.22.0",
     privateBakingKey: private_oxhead_baking_key,
     indexers: [
       {
@@ -241,7 +241,7 @@ const oxfordnet_chain = new TezosChain(
     humanName: "Oxfordnet",
     description: "Test Chain for the Oxford Protocol Proposal",
     bootstrapPeers: ["oxfordnet.boot.ecadinfra.com", "oxfordnet.tzinit.org"],
-    chartRepoVersion: "6.21.0",
+    chartRepoVersion: "6.22.0",
     privateBakingKey: private_oxhead_baking_key,
     indexers: [
       // {
diff --git a/mondaynet/faucet_values.yaml b/mondaynet/faucet_values.yaml
index 056e4ff8..d0b02abf 100644
--- a/mondaynet/faucet_values.yaml
+++ b/mondaynet/faucet_values.yaml
@@ -1,6 +1,6 @@
 images:
-  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:pow
-  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:pow
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.0.0
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.0.0
 
 # Frontend app configuration. You can optionally deploy only the faucet backend.
 enableUI: true
diff --git a/nairobinet/faucet_values.yaml b/nairobinet/faucet_values.yaml
index fbeb5080..42da209c 100644
--- a/nairobinet/faucet_values.yaml
+++ b/nairobinet/faucet_values.yaml
@@ -1,30 +1,32 @@
 images:
-  tezos_faucet: ghcr.io/oxheadalpha/tezos-faucet:1.2.1
-  tezos_faucet_backend: ghcr.io/oxheadalpha/tezos-faucet-backend:1.1
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.0.0
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.0.0
+
 authorizedHost: # filled in by pulumi
 maxBalance: 61000
+
 config:
   application:
-     name: "Tezos Nairobinet faucet"
-     googleCaptchaSiteKey: #filled in by pulumi
-     backendUrl: # filled in by pulumi
-     githubRepo: "https://github.com/oxheadalpha/tezos-faucet"
-     profiles:
-       user:
-         profile: USER
-         amount: 100
-       baker:
-         profile: BAKER
-         amount: 6001
+    name: "Tezos Nairobinet faucet"
+    googleCaptchaSiteKey: #filled in by pulumi
+    backendUrl: # filled in by pulumi
+    githubRepo: "https://github.com/oxheadalpha/tezos-faucet"
   network:
-     name: # filled in by pulumi
-     rpcUrl: # filled in by pulumi
-     faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
-     viewer: https://nairobi.tzstats.com
-     allowSendButton: false
+    name: # filled in by pulumi
+    rpcUrl: # filled in by pulumi
+    faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
+    viewer: https://nairobi.tzstats.com
+
+profiles:
+  user:
+    amount: 100
+  baker:
+    amount: 6001
+
 ingress:
   enabled: true
   annotations:
     "kubernetes.io/ingress.class": "nginx"
-    'cert-manager.io/cluster-issuer': "letsencrypt-prod"
+    "cert-manager.io/cluster-issuer": "letsencrypt-prod"
   host: # faucet fqdn, filled in by pulumi
+
diff --git a/oxfordnet/faucet_values.yaml b/oxfordnet/faucet_values.yaml
index 0d52204a..f4a3c2ff 100644
--- a/oxfordnet/faucet_values.yaml
+++ b/oxfordnet/faucet_values.yaml
@@ -1,30 +1,30 @@
 images:
-  tezos_faucet: ghcr.io/oxheadalpha/tezos-faucet:1.2.1
-  tezos_faucet_backend: ghcr.io/oxheadalpha/tezos-faucet-backend:1.1
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.0.0
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.0.0
+
 authorizedHost: # filled in by pulumi
 maxBalance: 61000
 config:
   application:
-     name: "Tezos Oxfordnet faucet"
-     googleCaptchaSiteKey: #filled in by pulumi
-     backendUrl: # filled in by pulumi
-     githubRepo: "https://github.com/oxheadalpha/tezos-faucet"
-     profiles:
-       user:
-         profile: USER
-         amount: 100
-       baker:
-         profile: BAKER
-         amount: 6001
+    name: "Tezos Oxfordnet faucet"
+    googleCaptchaSiteKey: #filled in by pulumi
+    backendUrl: # filled in by pulumi
+    githubRepo: "https://github.com/oxheadalpha/tezos-faucet"
   network:
-     name: # filled in by pulumi
-     rpcUrl: # filled in by pulumi
-     faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
-     viewer: https://oxford.tzstats.com
-     allowSendButton: false
+    name: # filled in by pulumi
+    rpcUrl: # filled in by pulumi
+    faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
+    viewer: https://oxford.tzstats.com
+
+profiles:
+  user:
+    amount: 100
+  baker:
+    amount: 6001
+
 ingress:
   enabled: true
   annotations:
     "kubernetes.io/ingress.class": "nginx"
-    'cert-manager.io/cluster-issuer': "letsencrypt-prod"
+    "cert-manager.io/cluster-issuer": "letsencrypt-prod"
   host: # faucet fqdn, filled in by pulumi