diff --git a/deployment/charts/gateway/Chart.yaml b/deployment/charts/gateway/Chart.yaml
index 23a66ab3..b3f2800e 100644
--- a/deployment/charts/gateway/Chart.yaml
+++ b/deployment/charts/gateway/Chart.yaml
@@ -1,12 +1,10 @@
 apiVersion: v2
 appVersion: 1.0.0
-version: 1.0.0
+version: v1.53.0
 description: VTH Gateway
 name: vth-gateway
-
 maintainers:
   - email: wael.jammal@azarc.io
     name: Wael Jammal
-
 sources:
   - https://github.com/azarc-io/verathread-gateway
diff --git a/deployment/charts/gateway/values.yaml b/deployment/charts/gateway/values.yaml
index 3007dd1b..3211065b 100644
--- a/deployment/charts/gateway/values.yaml
+++ b/deployment/charts/gateway/values.yaml
@@ -1,13 +1,9 @@
 replicas: 1
-
-nodeSelector: { }
-
+nodeSelector: {}
 nameOverride: "gateway"
 fullnameOverride: "gateway"
-
 imagePullSecrets:
   - name: ghcr-login-secret
-
 # if using traefik as your proxy
 traefik: "yes"
 # disables deployment of any proxy middle wares
@@ -16,27 +12,23 @@ middleware_enabled: "no"
 dev: false
 # hmr for the front end
 hmr: false
-
 fileStorage:
   enabled: false
-
 # Custom Service account management
 serviceAccount:
   # Whether to create service account or not
   create: true
   # Name of the service account
   name: gateway-svc-account
-
 image:
   # the gateway image
-  repository: k3d-local-registry:5000/vth-gateway
-  tag: latest
+  repository: ghcr.io/azarc-io/verathread-gateway/gateway-be
+  tag: v1.53.0
   # the web sidecar, if hmr is true then the sidecar will run node and build the web app
   # otherwise it will be a lightweight container that hosts the files on behalf of the gateway
-  web_repository: k3d-local-registry:5000/vth-gateway-web
-  web_repository_tag: latest
+  web_repository: ghcr.io/azarc-io/verathread-gateway/gateway-fe
+  web_repository_tag: v1.53.0
   pullPolicy: Always
-
 # port bindings
 bind:
   http: &bindHttpPort 6010
@@ -45,11 +37,9 @@ bind:
   dapr_health_check_port: 3500
   hmr: 3000
   debug: 40000
-
 # labels to attach to all resources
 commonLabels:
   verathread.com/scrape-logs: "true"
-
 # pod annotations
 annotations:
   dapr.io/enabled: "true"
@@ -58,7 +48,6 @@ annotations:
   dapr.io/config: "gateway-config"
   dapr.io/log-level: "warn"
   dapr.io/sidecar-image: ghcr.io/azarc-io/dapr:1.13.4-vth-linux-amd64
-
 # handles routing, is split into two / for web and /graphql and /modules for api and static file proxy
 ingress:
   # If `true`, an Ingress is created
@@ -71,7 +60,7 @@ ingress:
       maxrequestbodybytes: 3750000
       memrequestbodybytes: 3750000
   # Additional Ingress labels
-  labels: { }
+  labels: {}
   # List of rules for the Ingress
   rules:
     - host: dev.cluster.local
@@ -84,7 +73,6 @@ ingress:
       service: gateway-web
       paths:
         - /
-
 # Service configuration
 configuration:
   name: gateway
@@ -133,7 +121,6 @@ configuration:
       address: ${BIND_ADDRESS}
       port: 6015
     services: {}
-
 # environment variables attached to the pod
 extraEnvVars:
   BASE_CONTEXT: config