diff --git a/charts/acaas/templates/gateway.yaml b/charts/acaas/templates/gateway.yaml
deleted file mode 100644
index 895aaafce..000000000
--- a/charts/acaas/templates/gateway.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-{{ if (index .Values "gateway" "enabled") }}
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: ace-hosted
-  namespace: {{ .Release.Namespace }}
-spec:
-  gatewayClassName: ace
-  listeners:
-  - name: https
-    protocol: HTTPS
-    port: 443
-    {{ if .Values.gateway.tls.enabled }}
-    tls:
-      mode: Terminate
-      certificateRefs:
-      - group: ""
-        kind: Secret
-        name: {{ default (printf "%s-cert" (include "acaas.fullname" .)) .Values.gateway.tls.secret.name }}
-        namespace: {{ .Release.Namespace }}
-    {{- end }}
-    allowedRoutes:
-      namespaces:
-        from: Same
-{{- end }}
diff --git a/charts/acaas/templates/ingress/route-hosted.yaml b/charts/acaas/templates/ingress/route-hosted.yaml
index 50ba37666..aca9563b9 100644
--- a/charts/acaas/templates/ingress/route-hosted.yaml
+++ b/charts/acaas/templates/ingress/route-hosted.yaml
@@ -14,7 +14,7 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: ace-hosted
+      name: ace
       namespace: {{ .Release.Namespace }}
       sectionName: https
   hostnames:
diff --git a/charts/ace/templates/platform/config.yaml b/charts/ace/templates/platform/config.yaml
index 69852ddd6..df701a275 100644
--- a/charts/ace/templates/platform/config.yaml
+++ b/charts/ace/templates/platform/config.yaml
@@ -168,7 +168,7 @@ stringData:
     API_URL                = {{ .Values.settings.openfga.apiURL }}
     PRE_SHARED_KEY         = {{ .Values.settings.openfga.preSharedKey }}
 
-  {{- if eq .Values.global.platform.deploymentType "Hosted" }}
+  {{- if (or (eq .Values.global.platform.deploymentType "Hosted") .Values.global.platform.offlineInstaller) }}
 
     [badger]
     PATH   = {{ .Values.global.infra.badger.mountPath }}
@@ -179,6 +179,9 @@ stringData:
     BUCKET        = {{ .Values.global.infra.invoice.bucket }}
     PREFIX        = {{ .Values.global.infra.invoice.prefix }}
     TRACKER_EMAIL = {{ .Values.global.infra.invoice.trackerEmail }}
+  {{- end }}
+
+  {{- if eq .Values.global.platform.deploymentType "Hosted" }}
 
     [contract]
     BUCKET          = {{ .Values.settings.contract.bucket }}
diff --git a/charts/ace/templates/platform/setup-config.yaml b/charts/ace/templates/platform/setup-config.yaml
index 3a4b87ad4..2d9bb626b 100644
--- a/charts/ace/templates/platform/setup-config.yaml
+++ b/charts/ace/templates/platform/setup-config.yaml
@@ -13,7 +13,7 @@ stringData:
     nats:
       exports: true
       reloadNatsAccounts: true
-      {{- if and .Release.IsInstall (eq .Values.global.platform.deploymentType "Hosted") }}
+      {{- if and .Release.IsInstall (or (eq .Values.global.platform.deploymentType "Hosted") .Values.global.platform.offlineInstaller) }}
       createNatsStream: true
       reloadPlatformAccounts: true
       {{- end }}