diff --git a/charts/chirpstack-integration/templates/chirpstack-secretconfig.yaml b/charts/chirpstack-integration/templates/chirpstack-secretconfig.yaml
index f7644330..3706ef3b 100644
--- a/charts/chirpstack-integration/templates/chirpstack-secretconfig.yaml
+++ b/charts/chirpstack-integration/templates/chirpstack-secretconfig.yaml
@@ -7,10 +7,10 @@ stringData:
   config.json: >-
     {
       "redisHost": "{{ .Values.config.redisHost }}",
-      "redisPort": "{{ .Values.config.redisPort | default "6379" }}",
+      "redisPort": "{{ .Values.config.redisPort | default 6379 }}",
       "redisPassword": "{{ .Values.config.redisPassword }}",
-      "disableWrite": "{{ .Values.config.disableWrite | default "false" }}",
-      "cleanMongoDB": "{{ .Values.config.cleanMongoDB | default "false" }}",
+      "disableWrite": {{ .Values.config.disableWrite | default false }},
+      "cleanMongoDB":  {{ .Values.config.cleanMongoDB | default false }},
       "mongoUrl": "{{ .Values.config.mongoUrl }}",
       "gRPCServer": "{{ .Values.config.gRPCServer | default "chirpstack:8080" }}",
       "apiToken": "{{ .Values.config.apiToken }}",
diff --git a/charts/chirpstack/templates/chirpstack-gateway-bridge-service.yaml b/charts/chirpstack/templates/chirpstack-gateway-bridge-service.yaml
index 7715c48d..ad5837d8 100644
--- a/charts/chirpstack/templates/chirpstack-gateway-bridge-service.yaml
+++ b/charts/chirpstack/templates/chirpstack-gateway-bridge-service.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: gateway-bridge
   name: chirpstack-gateway-bridge
 spec:  
-  type: NodePort  
+  type:    {{ .Values.gateway_bridge.service_type }}
   ports:
     - name: "1700"
       port: 1700
diff --git a/charts/chirpstack/templates/chirpstack-rest-api-deployment.yaml b/charts/chirpstack/templates/chirpstack-rest-api-deployment.yaml
index 759b328b..adff5bea 100644
--- a/charts/chirpstack/templates/chirpstack-rest-api-deployment.yaml
+++ b/charts/chirpstack/templates/chirpstack-rest-api-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.chirpstack.est_api_enabled }}
+{{- if .Values.chirpstack.rest_api_enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:  
@@ -28,7 +28,7 @@ spec:
               protocol: TCP
           {{ if .Values.resources.rest_api }}
           resources:
-            {{ toYaml .Values.resources.rest_api | indent 12 }}
+{{ toYaml .Values.resources.rest_api | indent 12 }}
           {{ end }}
       restartPolicy: Always
 {{- end }}
\ No newline at end of file
diff --git a/charts/chirpstack/templates/chirpstack-rest-api-service.yaml b/charts/chirpstack/templates/chirpstack-rest-api-service.yaml
index 443c51cc..4b820902 100644
--- a/charts/chirpstack/templates/chirpstack-rest-api-service.yaml
+++ b/charts/chirpstack/templates/chirpstack-rest-api-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.chirpstack.est_api_enabled }}
+{{- if .Values.chirpstack.rest_api_enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/chirpstack/templates/chirpstack-service.yaml b/charts/chirpstack/templates/chirpstack-service.yaml
index a1f82f9c..fcf96873 100644
--- a/charts/chirpstack/templates/chirpstack-service.yaml
+++ b/charts/chirpstack/templates/chirpstack-service.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: networkServer
   name: chirpstack
 spec:
-  type: NodePort
+  type: {{ if .Values.chirpstack.networkserver_node_port }}NodePort{{ else }}ClusterIP{{ end }}
   ports:
     - name: "8080"
       port: 8080
diff --git a/charts/chirpstack/templates/mosquitto-service.yaml b/charts/chirpstack/templates/mosquitto-service.yaml
index a36c4661..c64c512d 100644
--- a/charts/chirpstack/templates/mosquitto-service.yaml
+++ b/charts/chirpstack/templates/mosquitto-service.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: mosquitto
   name: mosquitto
 spec:
-  type: NodePort
+  type: {{ .Values.mosquitto.service_type }}
   ports:
     - name: "1883"
       port: 1883
diff --git a/charts/chirpstack/values.yaml b/charts/chirpstack/values.yaml
index bc6fde4e..2afaff49 100644
--- a/charts/chirpstack/values.yaml
+++ b/charts/chirpstack/values.yaml
@@ -37,9 +37,11 @@ chirpstack :
     className : "nginx"
 
 gateway_bridge : 
+  service_type : "ClusterIP"
   bridge_station_node_port : 
 
 mosquitto : 
+  service_type : "ClusterIP"
   node_port :