diff --git a/podman-ntfy/container/Containerfile b/podman-ntfy/container/Containerfile
index b33e870..310a2dd 100644
--- a/podman-ntfy/container/Containerfile
+++ b/podman-ntfy/container/Containerfile
@@ -1,15 +1,27 @@
 #Build stage
-FROM docker.io/library/golang:1.20-alpine3.18 AS build-env
+FROM docker.io/library/golang:1.21-bullseye AS build-env
 
 ARG NTFY_VERSION
+ARG VERSION=dev
+ARG COMMIT=unknown
+ARG NODE_MAJOR=18
 
-RUN apk --no-cache add build-base git nodejs npm upx py3-pip \
-    && go install github.com/goreleaser/goreleaser@latest \
+RUN apt-get update && apt-get install -y \
+       build-essential ca-certificates curl gnupg \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" >> /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install -y \
+      python3-pip \
+      python3-venv \
+      nodejs \
+    && rm -rf /var/lib/apt/lists/* \
     && git clone --depth=1 -b "${NTFY_VERSION}" https://github.com/binwiederhier/ntfy.git /ntfybuild
 WORKDIR /ntfybuild
-RUN make web && make docs && make cli-linux-amd64
+RUN make web && make docs && make cli-deps-all && make VERSION=$NTFY_VERSION cli-linux-amd64
 
-FROM docker.io/library/alpine:3.17
+FROM docker.io/library/alpine:latest
 LABEL maintainer="contact@garbaye.fr"
 
 EXPOSE 80/tcp
diff --git a/podman-ntfy/vars.sh b/podman-ntfy/vars.sh
index 54a0705..630e998 100644
--- a/podman-ntfy/vars.sh
+++ b/podman-ntfy/vars.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ## vars
 ntfy_image="git.garbaye.fr/garbaye/ntfy"
-ntfy_version='v2.7.0'
+ntfy_version='v2.8.0'
 ## default vars : override with ENV var
 listen_if="${GARBAYE_NTFY_ENV_LISTENIF:-127.0.0.1}"
 listen_port="${GARBAYE_NTFY_ENV_LISTENPORT:-8091}"