diff --git a/Dockerfile.web b/Dockerfile.web
index c9b38f04c..a5212e374 100644
--- a/Dockerfile.web
+++ b/Dockerfile.web
@@ -1,5 +1,5 @@
-FROM jeroenwillemsen/wrongsecrets:1.5.7-no-vault
-ARG argBasedVersion="1.5.7"
+FROM jeroenwillemsen/wrongsecrets:1.5.8-no-vault
+ARG argBasedVersion="1.5.8"
 ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp"
 ARG CTF_ENABLED=false
 ARG HINTS_ENABLED=true
diff --git a/aws/k8s/secret-challenge-vault-deployment.yml b/aws/k8s/secret-challenge-vault-deployment.yml
index 2274bb3d7..088f9b1af 100644
--- a/aws/k8s/secret-challenge-vault-deployment.yml
+++ b/aws/k8s/secret-challenge-vault-deployment.yml
@@ -39,7 +39,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-aws-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:
diff --git a/azure/k8s/secret-challenge-vault-deployment.yml.tpl b/azure/k8s/secret-challenge-vault-deployment.yml.tpl
index 6ad01b743..b56ee66ba 100644
--- a/azure/k8s/secret-challenge-vault-deployment.yml.tpl
+++ b/azure/k8s/secret-challenge-vault-deployment.yml.tpl
@@ -41,7 +41,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "azure-wrongsecrets-vault"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:
diff --git a/fly.toml b/fly.toml
index 00d554756..291d3e80b 100644
--- a/fly.toml
+++ b/fly.toml
@@ -9,7 +9,7 @@ processes = []
   dockerfile = "Dockerfile"
 
 [build.args]
-  argBasedVersion="1.5.7"
+  argBasedVersion="1.5.8"
   spring_profile="without-vault"
 
 [env]
diff --git a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl
index 1d16fed97..acb3e85dd 100644
--- a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl
+++ b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl
@@ -39,7 +39,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-gcp-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           ports:
diff --git a/k8s/secret-challenge-deployment.yml b/k8s/secret-challenge-deployment.yml
index 2d3f98658..7e8561f4f 100644
--- a/k8s/secret-challenge-deployment.yml
+++ b/k8s/secret-challenge-deployment.yml
@@ -28,7 +28,7 @@ spec:
         runAsGroup: 2000
         fsGroup: 2000
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-no-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           ports:
diff --git a/k8s/secret-challenge-vault-deployment.yml b/k8s/secret-challenge-vault-deployment.yml
index 79c555a4f..ed0d96587 100644
--- a/k8s/secret-challenge-vault-deployment.yml
+++ b/k8s/secret-challenge-vault-deployment.yml
@@ -30,7 +30,7 @@ spec:
         runAsNonRoot: true
       serviceAccountName: vault
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:
diff --git a/okteto/k8s/secret-challenge-deployment.yml b/okteto/k8s/secret-challenge-deployment.yml
index 12fc3c569..1d858fa46 100644
--- a/okteto/k8s/secret-challenge-deployment.yml
+++ b/okteto/k8s/secret-challenge-deployment.yml
@@ -28,7 +28,7 @@ spec:
         runAsGroup: 2000
         fsGroup: 2000
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.5.7-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.5.8-no-vault
           name: secret-challenge
           imagePullPolicy: IfNotPresent
           securityContext: