diff --git a/nomad/structs/generate.sh b/nomad/structs/generate.sh
index 34147c918..04141c34a 100755
--- a/nomad/structs/generate.sh
+++ b/nomad/structs/generate.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-FILES="$(ls *[!_test].go | tr '\n' ' ')"
+FILES="$(ls ./*.go | grep -v -e _test.go -e .generated.go | tr '\n' ' ')"
 codecgen -d 100 -o structs.generated.go ${FILES}
diff --git a/scripts/install-codecgen.sh b/scripts/install-codecgen.sh
index 4fb7212f6..7a33b92d5 100644
--- a/scripts/install-codecgen.sh
+++ b/scripts/install-codecgen.sh
@@ -3,7 +3,7 @@
 set -e
 
 # Match entry in vendor.json
-GIT_TAG="v1.1.2"
+GIT_TAG="0053ebfd9d0ee06ccefbfe17072021e1d4acebee"
 echo "Installing codec/codecgen@${GIT_TAG} ..."
 
 # Either fetch in existing git repo or use go get to clone