diff --git a/charts/charts.mk b/charts/charts.mk
index 5b5544e..4ae043b 100644
--- a/charts/charts.mk
+++ b/charts/charts.mk
@@ -22,14 +22,17 @@ define _docgen
 	fi
 endef
 
+EMISSARY_CHART_REPO_GA  = https://s3.amazonaws.com/datawire-static-files/charts
+EMISSARY_CHART_REPO_PRE = https://s3.amazonaws.com/datawire-static-files/charts-dev
+EMISSARY_CHART_REPO     = $(if $(findstring -,$(EMISSARY_CHART_VERSION)),$(EMISSARY_CHART_REPO_PRE),$(EMISSARY_CHART_REPO_GA))
 chart/update-emissary: $(YQ)
-	[ -n "${EMISSARY_CHART_VERSION}" ] || (echo "EMISSARY_CHART_VERSION must be set for non-GA pushes" && exit 1)
+	[ -n '$(EMISSARY_CHART_VERSION)' ] || (echo "EMISSARY_CHART_VERSION must be set for non-GA pushes" && exit 1)
 	rm -f $(CHART_DIR)/charts/emissary-ingress*.tgz
-	$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).version' "${EMISSARY_CHART_VERSION}"
+	$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).version' '$(patsubst v%,%,$(EMISSARY_CHART_VERSION))'
+	$(YQ) w -i $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).repository' '$(EMISSARY_CHART_REPO)'
 	helm repo rm emissary-updater || true
-	helm repo add emissary-updater `$(YQ) r $(CHART_DIR)/Chart.yaml 'dependencies.(name==emissary-ingress).repository'`
+	helm repo add emissary-updater '$(EMISSARY_CHART_REPO)'
 	helm dep update $(CHART_DIR)
-	git add $(CHART_DIR)/charts/emissary*.tgz $(CHART_DIR)/Chart.yaml $(CHART_DIR)/Chart.lock
 .PHONY: chart/update-emissary
 
 chart/docgen:
diff --git a/charts/edge-stack/Chart.lock b/charts/edge-stack/Chart.lock
index d37ed78..0c9ff4a 100644
--- a/charts/edge-stack/Chart.lock
+++ b/charts/edge-stack/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: emissary-ingress
   repository: https://s3.amazonaws.com/datawire-static-files/charts-dev
-  version: 7.3.0-rc.2
-digest: sha256:e775b3ac12922dbf838a1a68eb4ad5bc531bb4e9aa76dc52b71edc234b91f383
-generated: "2022-02-07T17:08:49.825495036-08:00"
+  version: 7.3.0-rc.2.0.20220209165154-b6cd397b4fb3
+digest: sha256:5e851285aa6ea6b7dfe9a0625cb3604ae1be41d5226cc98208e7cb6b64e698ce
+generated: "2022-02-09T10:10:32.32440863-07:00"
diff --git a/charts/edge-stack/Chart.yaml b/charts/edge-stack/Chart.yaml
index 47ede90..b665170 100644
--- a/charts/edge-stack/Chart.yaml
+++ b/charts/edge-stack/Chart.yaml
@@ -27,5 +27,5 @@ maintainers:
 engine: gotpl
 dependencies:
 - name: emissary-ingress
-  version: 7.3.0-rc.2
-  repository: "https://s3.amazonaws.com/datawire-static-files/charts-dev"
+  version: 7.3.0-rc.2.0.20220209165154-b6cd397b4fb3
+  repository: https://s3.amazonaws.com/datawire-static-files/charts-dev
diff --git a/manifests/edge-stack/aes-ambassadorns-agent.yaml b/manifests/edge-stack/aes-ambassadorns-agent.yaml
index a67a641..c556442 100644
--- a/manifests/edge-stack/aes-ambassadorns-agent.yaml
+++ b/manifests/edge-stack/aes-ambassadorns-agent.yaml
@@ -237,8 +237,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
diff --git a/manifests/edge-stack/aes-ambassadorns-migration.yaml b/manifests/edge-stack/aes-ambassadorns-migration.yaml
index 02da072..24b63d9 100644
--- a/manifests/edge-stack/aes-ambassadorns-migration.yaml
+++ b/manifests/edge-stack/aes-ambassadorns-migration.yaml
@@ -151,7 +151,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes-ambassadorns.yaml b/manifests/edge-stack/aes-ambassadorns.yaml
index 204112c..823119c 100644
--- a/manifests/edge-stack/aes-ambassadorns.yaml
+++ b/manifests/edge-stack/aes-ambassadorns.yaml
@@ -522,8 +522,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
@@ -604,7 +604,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes-defaultns-agent.yaml b/manifests/edge-stack/aes-defaultns-agent.yaml
index 4b0cda0..57c3005 100644
--- a/manifests/edge-stack/aes-defaultns-agent.yaml
+++ b/manifests/edge-stack/aes-defaultns-agent.yaml
@@ -237,8 +237,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
diff --git a/manifests/edge-stack/aes-defaultns-migration.yaml b/manifests/edge-stack/aes-defaultns-migration.yaml
index 47f341e..af75d2e 100644
--- a/manifests/edge-stack/aes-defaultns-migration.yaml
+++ b/manifests/edge-stack/aes-defaultns-migration.yaml
@@ -151,7 +151,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes-defaultns.yaml b/manifests/edge-stack/aes-defaultns.yaml
index efbb95b..301bbe8 100644
--- a/manifests/edge-stack/aes-defaultns.yaml
+++ b/manifests/edge-stack/aes-defaultns.yaml
@@ -514,8 +514,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
@@ -596,7 +596,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes-emissaryns-agent.yaml b/manifests/edge-stack/aes-emissaryns-agent.yaml
index 883293b..fc81184 100644
--- a/manifests/edge-stack/aes-emissaryns-agent.yaml
+++ b/manifests/edge-stack/aes-emissaryns-agent.yaml
@@ -237,8 +237,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
diff --git a/manifests/edge-stack/aes-emissaryns-migration.yaml b/manifests/edge-stack/aes-emissaryns-migration.yaml
index d5f3f2b..20a07d3 100644
--- a/manifests/edge-stack/aes-emissaryns-migration.yaml
+++ b/manifests/edge-stack/aes-emissaryns-migration.yaml
@@ -151,7 +151,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes-emissaryns.yaml b/manifests/edge-stack/aes-emissaryns.yaml
index 46a158c..8f21f8c 100644
--- a/manifests/edge-stack/aes-emissaryns.yaml
+++ b/manifests/edge-stack/aes-emissaryns.yaml
@@ -522,8 +522,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
@@ -604,7 +604,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef:
diff --git a/manifests/edge-stack/aes.yaml b/manifests/edge-stack/aes.yaml
index 204112c..823119c 100644
--- a/manifests/edge-stack/aes.yaml
+++ b/manifests/edge-stack/aes.yaml
@@ -522,8 +522,8 @@ spec:
         imagePullPolicy: IfNotPresent
         command: [agent]
         ports:
-        - containerPort: 8006
-          name: grpc
+        - containerPort: 8080
+          name: http
         env:
         - name: AGENT_NAMESPACE
           valueFrom:
@@ -604,7 +604,7 @@ spec:
           containerPort: 8877
         env:
         - name: AMBASSADOR_GRPC_METRICS_SINK
-          value: edge-stack:8006
+          value: edge-stack-agent:80
         - name: HOST_IP
           valueFrom:
             fieldRef: