diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b476f61a6..70b3200a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,8 @@ name: build
 
 on:
   push:
-    branches:    
+    branches:
+      - 'main'
       - 'release/**'
 
 env:
@@ -108,7 +109,8 @@ jobs:
       - name: Remove + from version
         run: |
           echo "version=$(echo $version | sed 's/+ent//g')" >> $GITHUB_ENV
-      - name: Docker Build (Action)
+
+      - name: Docker Build
         uses: hashicorp/actions-docker-build@v1
         with:
           version: ${{env.version}}
@@ -117,4 +119,5 @@ jobs:
           tags: |
             docker.io/hashicorp/${{env.repo}}:${{env.version}}
           dev_tags: |
-            docker.io/hashicorppreview/${{env.repo}}:${{env.version}}
+            docker.io/hashicorppreview/${{env.repo}}:${{env.version}}-dev
+            docker.io/hashicorppreview/${{env.repo}}:${{env.version}}-${{github.sha}}-dev
diff --git a/.release/ci.hcl b/.release/ci.hcl
index 92feea1df..21461818d 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -3,12 +3,12 @@ schema = "1"
 project "consul-api-gateway" {
   team = "consul-api-gateway"
   slack {
-    notification_channel = "C01RWVBQ6GJ"
+    notification_channel = "C03BY5JVCKS"
   }
   github {
     organization = "hashicorp"
     repository = "consul-api-gateway"
-    release_branches = ["release/0.1.x", "release/0.2.x"]
+    release_branches = ["main", "release/0.1.x", "release/0.2.x"]
   }
 }
 
diff --git a/Makefile b/Makefile
index 372d7ddb3..6dd7c6757 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,10 @@ endif
 test:
 	go test ./...
 
+generate-golden-files:
+	GENERATE=true go test ./internal/envoy
+	GENERATE=true go test ./internal/k8s/builder
+
 .PHONY: changelog
 changelog:
 ifeq (, $(shell which changelog-build))
diff --git a/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml b/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml
index ec9624c6a..4d1c4b264 100644
--- a/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml
+++ b/internal/k8s/builder/testdata/clusterip.deployment.golden.yaml
@@ -80,7 +80,7 @@ spec:
         - cp
         - /bin/consul-api-gateway
         - /bootstrap/consul-api-gateway
-        image: hashicorp/consul-api-gateway:0.2.1
+        image: hashicorp/consul-api-gateway:0.3.0
         name: consul-api-gateway-init
         resources: {}
         volumeMounts:
diff --git a/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml b/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml
index 9670c1b2f..85eb5ea8e 100644
--- a/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml
+++ b/internal/k8s/builder/testdata/loadbalancer.deployment.golden.yaml
@@ -80,7 +80,7 @@ spec:
         - cp
         - /bin/consul-api-gateway
         - /bootstrap/consul-api-gateway
-        image: hashicorp/consul-api-gateway:0.2.1
+        image: hashicorp/consul-api-gateway:0.3.0
         name: consul-api-gateway-init
         resources: {}
         volumeMounts:
diff --git a/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml b/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml
index c52411823..121b04771 100644
--- a/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml
+++ b/internal/k8s/builder/testdata/static-mapping.deployment.golden.yaml
@@ -83,7 +83,7 @@ spec:
         - cp
         - /bin/consul-api-gateway
         - /bootstrap/consul-api-gateway
-        image: hashicorp/consul-api-gateway:0.2.1
+        image: hashicorp/consul-api-gateway:0.3.0
         name: consul-api-gateway-init
         resources: {}
         volumeMounts:
diff --git a/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml b/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml
index e8d9ea2e9..93b14922c 100644
--- a/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml
+++ b/internal/k8s/builder/testdata/tls-cert.deployment.golden.yaml
@@ -83,7 +83,7 @@ spec:
         - cp
         - /bin/consul-api-gateway
         - /bootstrap/consul-api-gateway
-        image: hashicorp/consul-api-gateway:0.2.1
+        image: hashicorp/consul-api-gateway:0.3.0
         name: consul-api-gateway-init
         resources: {}
         volumeMounts:
diff --git a/internal/version/version.go b/internal/version/version.go
index 826d4df8a..5305378a1 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -14,7 +14,7 @@ var (
 	//
 	// Version must conform to the format expected by
 	// github.com/hashicorp/go-version for tests to work.
-	Version = "0.2.1"
+	Version = "0.3.0"
 
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release