diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..ace082df5
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,46 @@
+name: Push to GCR GitHub Action
+on: 
+  push:
+    branches:
+      - '**'
+    tags:
+      - '**'
+  # pull_request:
+  #   branches:
+  #     - 'main'
+jobs:
+  build-and-push-to-gcr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            gcr.io/clabs-optics/optics-agent
+          # generate Docker tags based on the following events/attributes
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha
+      - 
+        name: Login to GCR
+        uses: docker/login-action@v1
+        with:
+          registry: gcr.io
+          username: _json_key
+          password: ${{ secrets.GCLOUD_SERVICE_KEY }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        env: 
+          DOCKER_BUILDKIT: 1
+        with:
+          context: ./rust
+          file: ./rust/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/rust/helm/optics-agent/templates/_helpers.tpl b/rust/helm/optics-agent/templates/_helpers.tpl
index d929a8f79..8747a1ab3 100644
--- a/rust/helm/optics-agent/templates/_helpers.tpl
+++ b/rust/helm/optics-agent/templates/_helpers.tpl
@@ -35,6 +35,7 @@ Common labels
 */}}
 {{- define "optics-agent.labels" -}}
 helm.sh/chart: {{ include "optics-agent.chart" . }}
+optics/deployment: {{ .Values.optics.runEnv | quote }}
 {{ include "optics-agent.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
diff --git a/rust/helm/optics-agent/values.yaml b/rust/helm/optics-agent/values.yaml
index be57e0479..4e7a9a2f2 100644
--- a/rust/helm/optics-agent/values.yaml
+++ b/rust/helm/optics-agent/values.yaml
@@ -76,7 +76,7 @@ optics:
         enabled: false
         name: ""
     resources: {}
-    # -- Trnsaction Signing keys for home and replica(s)
+    # -- Transaction Signing keys for home and replica(s)
     transactionSigners:
       - name: "kovan"
         hexKey: ""
@@ -88,7 +88,7 @@ optics:
         aws:
           keyId: ""
           region: ""
-    # -- Specialized key used by updater and watcher used to sign attestations, separate from updater.keys
+    # -- Specialized key used by updater and watcher used to sign attestations, separate from updater.transactionSigners
     attestationSigner:
       hexKey: ""
       aws: