diff --git a/assets/yopass-server/Dockerfile b/assets/yopass-server/Dockerfile
index 3d7f86e..c6b004c 100644
--- a/assets/yopass-server/Dockerfile
+++ b/assets/yopass-server/Dockerfile
@@ -1,6 +1,6 @@
 # --------------------------------------------------------------------- base ---
 
-FROM golang:1.22.1 as base
+FROM golang:1.22 as base
 
 ARG YOPASS_VERSION=latest
 
diff --git a/assets/yopass-website/Dockerfile b/assets/yopass-website/Dockerfile
index 80ae300..878dcb3 100644
--- a/assets/yopass-website/Dockerfile
+++ b/assets/yopass-website/Dockerfile
@@ -1,10 +1,12 @@
 # --------------------------------------------------------------------- base ---
 
-FROM node:18 as base
+FROM node:20 as base
 
 RUN mkdir -p /opt/app
 WORKDIR /opt/app
 
+ARG YOPASS_VERSION=latest
+
 RUN git clone https://github.com/jhaals/yopass.git .
 RUN if [ "$YOPASS_VERSION" != "latest" ] ; then git checkout $YOPASS_VERSION ; fi
 
diff --git a/main.tf b/main.tf
index a3d6f8b..11ecf64 100755
--- a/main.tf
+++ b/main.tf
@@ -35,7 +35,7 @@ resource "random_string" "yopass_random_suffix" {
 
 module "yopass_website_assets" {
   source  = "cruxstack/artifact-packager/docker"
-  version = "1.3.6"
+  version = "1.3.7"
 
   attributes             = ["website"]
   artifact_src_path      = "/tmp/package.zip"
@@ -54,7 +54,7 @@ module "yopass_website_assets" {
 
 module "yopass_website" {
   source  = "cloudposse/cloudfront-s3-cdn/aws"
-  version = "0.92.0"
+  version = "0.94.0"
 
   aliases             = [var.website_domain_name]
   acm_certificate_arn = var.website_certificate_arn
@@ -125,7 +125,7 @@ module "yopass_website" {
 
 module "yopass_website_uploader" {
   source  = "cruxstack/s3-zip-uploader/aws"
-  version = "1.3.0"
+  version = "1.3.1"
 
   artifact_dst_bucket_arn = module.yopass_website.s3_bucket_arn
   artifact_src_local_path = module.yopass_website_assets.artifact_package_path
@@ -168,7 +168,7 @@ data "aws_cloudfront_response_headers_policy" "cors_preflight_hsts" {
 
 module "cloudfront_middleware_at_edge" {
   source  = "cruxstack/cloudfront-middleware-at-edge/aws"
-  version = "0.3.3"
+  version = "0.3.4"
 
   enabled    = var.auth_enabled
   attributes = ["mw"]
@@ -192,7 +192,7 @@ module "cloudfront_middleware_at_edge" {
 
 module "yopass_server_code" {
   source  = "cruxstack/artifact-packager/docker"
-  version = "1.3.6"
+  version = "1.3.7"
 
   attributes             = ["server"]
   artifact_src_path      = "/tmp/package.zip"