diff --git a/bridge/standard/bridge-v1/.goreleaser.yml b/bridge/standard/bridge-v1/.goreleaser.yml
index b3c4d18a5..a207fcae1 100644
--- a/bridge/standard/bridge-v1/.goreleaser.yml
+++ b/bridge/standard/bridge-v1/.goreleaser.yml
@@ -47,7 +47,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -71,7 +73,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -88,7 +92,9 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt
 
 changelog:
diff --git a/infrastructure/tools/keystore-generator/.goreleaser.yml b/infrastructure/tools/keystore-generator/.goreleaser.yml
index ec58aeb9c..4216492e2 100644
--- a/infrastructure/tools/keystore-generator/.goreleaser.yml
+++ b/infrastructure/tools/keystore-generator/.goreleaser.yml
@@ -28,7 +28,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -45,5 +47,7 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt
diff --git a/oracle/.goreleaser.yml b/oracle/.goreleaser.yml
index 870ca49b3..c408cc5ab 100644
--- a/oracle/.goreleaser.yml
+++ b/oracle/.goreleaser.yml
@@ -25,7 +25,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -42,7 +44,9 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt
 
 # TODO(mrekucci): Re-enable when the repo is finalized.
diff --git a/p2p/.goreleaser.yml b/p2p/.goreleaser.yml
index eb41d926e..80bc5deaf 100644
--- a/p2p/.goreleaser.yml
+++ b/p2p/.goreleaser.yml
@@ -35,7 +35,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -52,7 +54,9 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt
 
 # TODO(mrekucci): Re-enable when the repo is finalized.
diff --git a/p2p/integrationtest/bidder/.goreleaser.yml b/p2p/integrationtest/bidder/.goreleaser.yml
index 94361c88f..22730b2dd 100644
--- a/p2p/integrationtest/bidder/.goreleaser.yml
+++ b/p2p/integrationtest/bidder/.goreleaser.yml
@@ -27,7 +27,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -44,5 +46,7 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt
diff --git a/p2p/integrationtest/provider/.goreleaser.yml b/p2p/integrationtest/provider/.goreleaser.yml
index e78363618..977445176 100644
--- a/p2p/integrationtest/provider/.goreleaser.yml
+++ b/p2p/integrationtest/provider/.goreleaser.yml
@@ -27,7 +27,9 @@ archives:
       {{- if .IsSnapshot }}{{ .ShortCommit }}
       {{- else }}{{ .Version }}
       {{ end }}
-      {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end }}_
+      {{- with index .Env "DIRTY_SUFFIX" -}}
+      {{ . }}
+      {{- end -}}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
@@ -44,5 +46,7 @@ checksum:
     {{- if .IsSnapshot }}{{ .ShortCommit }}
     {{- else }}{{ .Version }}
     {{- end }}
-    {{- if .Env.DIRTY_SUFFIX }}{{ .Env.DIRTY_SUFFIX }}{{ end -}}
+    {{- with index .Env "DIRTY_SUFFIX" -}}
+    {{ . }}
+    {{- end -}}
     _checksums.txt