diff --git a/charts/soft-serve/templates/service.yaml b/charts/soft-serve/templates/service.yaml
index bd95039..9e54b46 100644
--- a/charts/soft-serve/templates/service.yaml
+++ b/charts/soft-serve/templates/service.yaml
@@ -20,9 +20,7 @@
   - name: ssh
     port: {{ .Values.port }}
     protocol: TCP
-  {{ if .Values.ingress.enabled }}
   - name: http
-    port: 80
+    port: 80 # TODO(gio): make configurable
     targetPort: http
     protocol: TCP
-  {{ end }}
diff --git a/charts/soft-serve/templates/stateful-set.yaml b/charts/soft-serve/templates/stateful-set.yaml
index 6626cb4..0d84eca 100644
--- a/charts/soft-serve/templates/stateful-set.yaml
+++ b/charts/soft-serve/templates/stateful-set.yaml
@@ -30,6 +30,8 @@
         env:
         - name: SOFT_SERVE_SSH_LISTEN_ADDR
           value: ":{{ .Values.port }}"
+        - name: SOFT_SERVE_SSH_PUBLIC_URL
+          value: "ssh://{{ .Values.ingress.domain }}:{{ .Values.sshPublicPort }}"
         - name: SOFT_SERVE_INITIAL_ADMIN_KEYS
           value: "{{ .Values.adminKey }}"
         {{ if and .Values.privateKey .Values.publicKey }}
@@ -38,12 +40,10 @@
         {{ end }}
         - name: SOFT_SERVE_DATA_PATH
           value: /var/lib/soft-serve/repos
-        {{ if .Values.ingress.enabled }}
         - name: SOFT_SERVE_HTTP_LISTEN_ADDR
           value: ":80"
         - name: SOFT_SERVE_HTTP_PUBLIC_URL
           value: "http://{{ .Values.ingress.domain }}"
-        {{ end }}
         ports:
         - name: ssh
           containerPort: {{ .Values.port }}
diff --git a/charts/soft-serve/values.yaml b/charts/soft-serve/values.yaml
index 772f58a..3f714a4 100644
--- a/charts/soft-serve/values.yaml
+++ b/charts/soft-serve/values.yaml
@@ -5,6 +5,7 @@
 storage:
   size: 1Gi
 port: 22
+sshPublicPort: 22
 privateKey: ""
 publicKey: ""
 adminKey: ""