diff --git a/charts/templates/web-deployment.yaml b/charts/templates/web-deployment.yaml
index 28dc74ab..67683681 100644
--- a/charts/templates/web-deployment.yaml
+++ b/charts/templates/web-deployment.yaml
@@ -21,19 +21,21 @@ spec:
         - name: web
           image: "{{ .Values.web.repository }}:{{ .Values.web.tag | default .Chart.AppVersion }}"
           ports:
-            - containerPort: 80
+            - containerPort: {{ .Values.web.port }}
+              protocol: TCP
+              name: web
           readinessProbe:
             initialDelaySeconds: 5
             httpGet:
               path: "/!/web"
-              port: 8000
+              port: web
               host: {{ .Values.ingress.host | quote }}
           livenessProbe:
             initialDelaySeconds: 5
             periodSeconds: 20
             httpGet:
               path: "/!/web"
-              port: 8000
+              port: web
               host: {{ .Values.ingress.host | quote }}
           envFrom:
             - secretRef:
@@ -46,14 +48,14 @@ spec:
             initialDelaySeconds: 3
             httpGet:
               path: "/!/proxy"
-              port: 80
+              port: proxy
           livenessProbe:
             initialDelaySeconds: 3
             periodSeconds: 20
             httpGet:
               path: "/!/proxy"
-              port: 80
+              port: proxy
           ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
+            - name: proxy
               protocol: TCP
+              containerPort: {{ .Values.proxy.port }}
diff --git a/charts/templates/web-svc.yaml b/charts/templates/web-svc.yaml
index 0ed7ef5f..43e6ddf3 100644
--- a/charts/templates/web-svc.yaml
+++ b/charts/templates/web-svc.yaml
@@ -8,10 +8,8 @@ spec:
   type: LoadBalancer
   selector:
     app: web
+    {{- include "fiesta.selectorLabels" . | nindent 4 }}
   ports:
     - port: 80
       name: http
-      targetPort: 80
-    - port: 443
-      name: https
-      targetPort: 443
+      targetPort: proxy
diff --git a/charts/values.yaml b/charts/values.yaml
index a5ff00b7..b2c50fc3 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -18,11 +18,12 @@ web:
   configName: web-config
   secretName: web-secret
 
+  port: 8000
+
 proxy:
   repository: nginxdemos/hello
   tag: latest
 
-service:
   port: 80
 
 secrets: