diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml
index 2a7e960b..1b7aa2d0 100644
--- a/helm/templates/configmap.yaml
+++ b/helm/templates/configmap.yaml
@@ -1,21 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.service.config.name }}
+  name: {{ .Values.configMap.name }}
   labels:
     release: {{ .Release.Name }}
 data:
-  application.conf: |-
-    entity.service.config = {
-      host = entity-service
-    }
-    query.service.config = {
-      host = query-service
-    }
-    attributes.service.config = {
-      host = attribute-service
-    }
-    
-    filter.entity.and.enabled = {{ .Values.service.config.gatewayServiceConfig.entityAndFilterEnabled }}
+  {{- toYaml .Values.configMap.data | nindent 2 }}
   
     
diff --git a/helm/values.yaml b/helm/values.yaml
index dd6c6e16..c5595cca 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -24,10 +24,6 @@ service:
   type: ClusterIP
   port: 50071
   adminPort: 50072
-  config:
-    name: gateway-service-config
-    gatewayServiceConfig:
-      entityAndFilterEnabled: false
 
 nodeLabels: {}
 
@@ -72,6 +68,21 @@ deploymentSelectorMatchLabels:
 serviceSelectorLabels:
   app: gateway-service
 
+configMap:
+  name: gateway-service-config
+  data:
+    application.conf: |-
+      entity.service.config = {
+        host = entity-service
+      }
+      query.service.config = {
+        host = query-service
+      }
+      attributes.service.config = {
+        host = attribute-service
+      }
+      filter.entity.and.enabled = false
+
 logConfig:
   name: gateway-service-log-config
   monitorInterval: 30