diff --git a/simple-go/templates/backend-deployment.yaml b/simple-go/templates/backend-deployment.yaml
index 3916ef6..89be97d 100644
--- a/simple-go/templates/backend-deployment.yaml
+++ b/simple-go/templates/backend-deployment.yaml
@@ -22,20 +22,11 @@ spec:
           {{- toYaml .Values.backend.resources | nindent 10 }}
         env:
         - name: PORT
-          valueFrom:
-            configMapKeyRef:
-              name: app-config
-              key: PORT
+          value: {{ .Values.config.port | quote }}
         - name: POSTGRES_DB
-          valueFrom:
-            configMapKeyRef:
-              name: app-config
-              key: POSTGRES_DB
+          value: {{ .Values.config.postgres.db | quote }}
         - name: POSTGRES_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: app-config
-              key: POSTGRES_HOST
+          value: {{ .Values.config.postgres.host | quote }}
         - name: POSTGRES_USER
           valueFrom:
             secretKeyRef:
diff --git a/simple-go/templates/postgres-deployment.yaml b/simple-go/templates/postgres-deployment.yaml
index 9ca2dbb..15cd8c0 100644
--- a/simple-go/templates/postgres-deployment.yaml
+++ b/simple-go/templates/postgres-deployment.yaml
@@ -22,10 +22,7 @@ spec:
           {{- toYaml .Values.postgres.resources | nindent 10 }}
         env:
         - name: POSTGRES_DB
-          valueFrom:
-            configMapKeyRef:
-              name: app-config
-              key: POSTGRES_DB
+          value: {{ .Values.config.postgres.db | quote }}
         - name: POSTGRES_USER
           valueFrom:
             secretKeyRef:
diff --git a/simple-go/templates/services.yaml b/simple-go/templates/services.yaml
index f91962f..c587a67 100644
--- a/simple-go/templates/services.yaml
+++ b/simple-go/templates/services.yaml
@@ -2,26 +2,26 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.backend.name }}-service
+  name: {{ .Values.frontend.name }}-service
 spec:
-  type: {{ .Values.backend.service.type }}
+  type: {{ .Values.frontend.service.type }}
   ports:
-  - port: {{ .Values.backend.service.port }}
-    targetPort: {{ .Values.backend.service.port }}
+  - port: {{ .Values.frontend.service.port }}
+    targetPort: {{ .Values.frontend.service.port }}
   selector:
-    app: {{ .Values.backend.name }}
+    app: {{ .Values.frontend.name }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.frontend.name }}-service
+  name: {{ .Values.backend.name }}-service
 spec:
-  type: {{ .Values.frontend.service.type }}
+  type: {{ .Values.backend.service.type }}
   ports:
-  - port: {{ .Values.frontend.service.port }}
-    targetPort: {{ .Values.frontend.service.port }}
+  - port: {{ .Values.backend.service.port }}
+    targetPort: {{ .Values.backend.service.port }}
   selector:
-    app: {{ .Values.frontend.name }}
+    app: {{ .Values.backend.name }}
 ---
 apiVersion: v1
 kind: Service