diff --git a/charts/soft-serve/templates/service.yaml b/charts/soft-serve/templates/service.yaml
index 9e54b46..9d64333 100644
--- a/charts/soft-serve/templates/service.yaml
+++ b/charts/soft-serve/templates/service.yaml
@@ -18,9 +18,9 @@
     app: soft-serve
   ports:
   - name: ssh
-    port: {{ .Values.port }}
+    port: {{ .Values.sshPort }}
     protocol: TCP
   - name: http
-    port: 80 # TODO(gio): make configurable
+    port: {{ .Values.httpPort }}
     targetPort: http
     protocol: TCP
diff --git a/charts/soft-serve/templates/stateful-set.yaml b/charts/soft-serve/templates/stateful-set.yaml
index 5cf32c6..f9152b2 100644
--- a/charts/soft-serve/templates/stateful-set.yaml
+++ b/charts/soft-serve/templates/stateful-set.yaml
@@ -29,7 +29,7 @@
         imagePullPolicy: {{ .Values.image.pullPolicy}}
         env:
         - name: SOFT_SERVE_SSH_LISTEN_ADDR
-          value: ":{{ .Values.port }}"
+          value: ":{{ .Values.sshPort }}"
         - name: SOFT_SERVE_SSH_PUBLIC_URL
           value: "ssh://{{ .Values.host }}:{{ .Values.sshPublicPort }}"
         - name: SOFT_SERVE_INITIAL_ADMIN_KEYS
@@ -42,15 +42,15 @@
         - name: SOFT_SERVE_DATA_PATH
           value: /var/lib/soft-serve/repos
         - name: SOFT_SERVE_HTTP_LISTEN_ADDR
-          value: ":80"
+          value: ":{{.Values.httpPort}}"
         - name: SOFT_SERVE_HTTP_PUBLIC_URL
           value: "http://{{ .Values.host }}"
         ports:
         - name: ssh
-          containerPort: {{ .Values.port }}
+          containerPort: {{ .Values.sshPort }}
           protocol: TCP
         - name: http
-          containerPort: 80
+          containerPort: {{ .Values.httpPort }}
           protocol: TCP
         volumeMounts:
         - name: data
diff --git a/charts/soft-serve/values.yaml b/charts/soft-serve/values.yaml
index 5538d5c..9f82ac8 100644
--- a/charts/soft-serve/values.yaml
+++ b/charts/soft-serve/values.yaml
@@ -4,7 +4,8 @@
   pullPolicy: IfNotPresent
 persistentVolumeClaimName: ""
 host: ""
-port: 22
+httpPort: 8080
+sshPort: 22
 sshPublicPort: 22
 privateKey: ""
 publicKey: ""