diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml
index 0c2e2939..07716aee 100644
--- a/.image-gitlab-ci.yml
+++ b/.image-gitlab-ci.yml
@@ -79,7 +79,7 @@ security_scan_trivy:
   artifacts:
     reports:
       container_scanning: gl-container-scanning-report.json
-    expire_in: 30 days
+    expire_in: 90 days
     paths: [ medium-vulns.txt ]
 
 promote_image:
diff --git a/lib/build/Makefile.docker_image b/lib/build/Makefile.docker_image
index 9fb3c17f..a4f3870e 100644
--- a/lib/build/Makefile.docker_image
+++ b/lib/build/Makefile.docker_image
@@ -1,7 +1,7 @@
 # Standard Makefile for Docker image
 #   created by richb@instantlinux.net 20-Apr-2017
 
-BUILDX      = https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64
+BUILDX      = https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64
 PLATFORMS  ?= linux/amd64
 PUSH       ?= --push
 USER_LOGIN ?= instantlinux