diff --git a/.gitignore b/.gitignore
index e7c7de57..99098673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ example/
 # Local dev files
 Tiltfile.local
 /config/tilt/helm/dev-values-local.yaml
+
+dist/
\ No newline at end of file
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 71bef97c..b5a1666b 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,3 +1,6 @@
+---
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+version: 2
 project_name: tf-controller
 
 release:
@@ -28,8 +31,8 @@ builds:
       - arm64
       - arm
     goarm:
-      - 6
-      - 7
+      - "6"
+      - "7"
 
 archives:
   - id: tfctl
@@ -69,14 +72,54 @@ brews:
   - name: tfctl
     ids:
     - tfctl
-    tap:
+    repository:
       owner: flux-iac
       name: homebrew-tap
       token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
     commit_author:
       name: flux-iac
       email: noreply@github.com
-    folder: Formula
+    directory: Formula
     homepage: https://flux-iac.github.io/tofu-controller
     install: |
       bin.install "tfctl"
+
+dockers:
+  - image_templates:
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-amd64"
+    use: buildx
+    dockerfile: tfctl.Dockerfile
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.url=https://github.com/flux-iac/{{.ProjectName}}"
+      - "--label=org.opencontainers.image.source=https://github.com/flux-iac/{{.ProjectName}}"
+      - "--label=org.opencontainers.image.licenses=Apache-2.0"
+  - image_templates:
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-arm64v8"
+    use: buildx
+    goarch: arm64
+    dockerfile: tfctl.Dockerfile
+    build_flag_templates:
+      - "--platform=linux/arm64/v8"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+      - "--label=org.opencontainers.image.url=https://github.com/flux-iac/{{.ProjectName}}"
+      - "--label=org.opencontainers.image.source=https://github.com/flux-iac/{{.ProjectName}}"
+      - "--label=org.opencontainers.image.licenses=Apache-2.0"
+
+docker_manifests:
+  - name_template: "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}"
+    image_templates:
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-amd64"
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-arm64v8"
+
+  - name_template: "ghcr.io/flux-iac/{{.ProjectName}}:latest"
+    image_templates:
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-amd64"
+      - "ghcr.io/flux-iac/{{.ProjectName}}:v{{.Version}}-arm64v8"
diff --git a/tfctl.Dockerfile b/tfctl.Dockerfile
new file mode 100644
index 00000000..af69d568
--- /dev/null
+++ b/tfctl.Dockerfile
@@ -0,0 +1,4 @@
+FROM alpine:3.20.3@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d
+USER 65532:65532
+COPY tfctl /usr/local/bin/tfctl
+ENTRYPOINT ["/usr/local/bin/tfctl"]
\ No newline at end of file