diff --git a/.goreleaser.yml b/.goreleaser.yml
index a347e6f..b2f6d92 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,11 +1,15 @@
 ---
+version: 2
 env:
   - VAULT111=1.11.12
   - VAULT112=1.12.11
   - VAULT113=1.13.13
   - VAULT114=1.14.10
   - VAULT115=1.15.6
-  - VAULT116=1.16.1
+  - VAULT116=1.16.3
+  - VAULT117=1.17.6
+  - VAULT118=1.18.4
+  - SOURCE_DATE_EPOCH=1609459200
 
 before:
   hooks:
@@ -24,14 +28,18 @@ builds:
     goarch:
       - amd64
       - arm64
+    mod_timestamp: '{{ .CommitTimestamp }}'
     flags:
       - -tags=static
     ldflags:
       - -s
       - -w
+      - -buildid= # Removes non-deterministic build ID
       - -X main.version={{.Tag}}
+      - -X main.commit={{.Commit}}
+      - -X main.date={{.CommitDate}}
     gcflags:
-      - -trimpath={{.Env.GOPATH}}
+      - all=-trimpath={{.Env.GOPATH}}
 dockers:
   ##############
   #  VAULT 1.11
@@ -44,6 +52,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT111}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -52,6 +61,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT111}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   ##############
   #  VAULT 1.12
   ##############
@@ -63,6 +73,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT112}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -71,6 +82,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT112}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   ##############
   #  VAULT 1.13
   ##############
@@ -82,6 +94,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT113}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -90,6 +103,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT113}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   ##############
   #  VAULT 1.14
   ##############
@@ -101,6 +115,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT114}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -109,6 +124,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT114}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   ##############
   #  VAULT 1.15
   ##############
@@ -120,6 +136,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT115}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -128,6 +145,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT115}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   ##############
   #  VAULT 1.16
   ##############
@@ -139,6 +157,7 @@ dockers:
     build_flag_templates:
       - "--platform=linux/amd64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT116}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
   - goos: linux
     goarch: arm64
     image_templates:
@@ -147,6 +166,49 @@ dockers:
     build_flag_templates:
       - "--platform=linux/arm64"
       - "--build-arg=VAULT_VERSION={{.Env.VAULT116}}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
+  ##############
+  #  VAULT 1.17
+  ##############
+  - goos: linux
+    goarch: amd64
+    image_templates:
+      - "contentsquareplatform/vault-plugin-database-clickhouse:{{ .Env.VAULT117 }}-{{ .Tag }}-amd64"
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--build-arg=VAULT_VERSION={{.Env.VAULT117 }}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
+  - goos: linux
+    goarch: arm64
+    image_templates:
+      - "contentsquareplatform/vault-plugin-database-clickhouse:{{ .Env.VAULT117 }}-{{ .Tag }}-arm64"
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/arm64"
+      - "--build-arg=VAULT_VERSION={{.Env.VAULT117 }}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
+  ##############
+  #  VAULT 1.18
+  ##############
+  - goos: linux
+    goarch: amd64
+    image_templates:
+      - "contentsquareplatform/vault-plugin-database-clickhouse:{{ .Env.VAULT118 }}-{{ .Tag }}-amd64"
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/amd64"
+      - "--build-arg=VAULT_VERSION={{.Env.VAULT118 }}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
+  - goos: linux
+    goarch: arm64
+    image_templates:
+      - "contentsquareplatform/vault-plugin-database-clickhouse:{{ .Env.VAULT118 }}-{{ .Tag }}-arm64"
+    use: buildx
+    build_flag_templates:
+      - "--platform=linux/arm64"
+      - "--build-arg=VAULT_VERSION={{.Env.VAULT118 }}"
+      - "--build-arg=SOURCE_DATE_EPOCH={{.Env.SOURCE_DATE_EPOCH }}"
 docker_manifests:
   ##############
   #  VAULT 1.11
@@ -227,4 +289,24 @@ docker_manifests:
       - "contentsquareplatform/vault-plugin-database-clickhouse:{{ .Env.VAULT116 }}-{{ .Tag }}-arm64"
     skip_push: false
 snapshot:
-  name_template: "{{ .FullCommit }}-SNAPSHOT"
+  version_template: '{{ .FullCommit }}-SNAPSHOT'
+# archives:
+#   - id: default
+#     name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
+#     formats:
+#       - tar.gz
+#     files:
+#       - src: LICENCE*
+#       - src: README*
+#   - id: clickhouse-database-plugin-binary
+#     name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
+#     formats:
+#       - binary
+
+# checksum:
+#   algorithm: sha256
+#   ids:
+#     - clickhouse-database-plugin-binary
+# release:
+#   ids:
+#     - default
diff --git a/README.md b/README.md
index 4ff64cd..45a1ede 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,8 @@ Checkout [Docker Hub](https://hub.docker.com/r/contentsquareplatform/vault-plugi
 * [vault 1.14](https://hub.docker.com/r/contentsquareplatform/vault-plugin-database-clickhouse/tags?page=1&name=1.14)
 * [vault 1.15](https://hub.docker.com/r/contentsquareplatform/vault-plugin-database-clickhouse/tags?page=1&name=1.15)
 * [vault 1.16](https://hub.docker.com/r/contentsquareplatform/vault-plugin-database-clickhouse/tags?page=1&name=1.16)
+* [vault 1.17](https://hub.docker.com/r/contentsquareplatform/vault-plugin-database-clickhouse/tags?page=1&name=1.17)
+* [vault 1.18](https://hub.docker.com/r/contentsquareplatform/vault-plugin-database-clickhouse/tags?page=1&name=1.18)
 
 # Plugin Sha256 (linux amd64 binary)
 
@@ -19,6 +21,7 @@ Checkout [Docker Hub](https://hub.docker.com/r/contentsquareplatform/vault-plugi
 | 0.1.1   | 18c7795c17db236b06351af89ea4d4f0dcbefa71ab9f56073be007ee5ccf3ae7|
 | 0.1.2   | 00fd995d848c0702f2f78151ebfb2724a0f94b88443a8362534e533ed1578b25|
 | 0.1.3   | e4c9039b5dc221728d146c807ba891be2dc92782e4c148a3eda37333b6642379|
+| 0.1.4   | 4571b9709fd3cc9e7c7d4f561fa4ba6541fb1f827b2a59081162b342553a3b0e|
 
 
 # Build & Tests
@@ -268,4 +271,3 @@ Query id: 15553c58-9b60-41ce-a19a-f0ff38b35cd8
 
 clickhouse-server:9000|default :)
 ```
-