diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b15185198..11cf56571 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   SIGN_PIPE_VER: "v0.1.5"
-  GORELEASER_VER: "v2.14.3"
+  GORELEASER_VER: "v2.16.0"
   PRODUCT_NAME: "NetBird"
   COPYRIGHT: "NetBird GmbH"
 
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 6d334ea21..8563169c9 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,7 +1,7 @@
 version: 2
 env:
   - SKIP_PUBLISH={{ if index .Env "SKIP_PUBLISH" }}{{ .Env.SKIP_PUBLISH }}{{ else }}true{{ end }}
-  - SKIP_DOCKER_PUSH={{ if index .Env "SKIP_DOCKER_PUSH" }}{{ .Env.SKIP_PUBLISH }}{{ else }}false{{ end }}
+  - SKIP_DOCKER_PUSH={{ if index .Env "SKIP_DOCKER_PUSH" }}{{ .Env.SKIP_DOCKER_PUSH }}{{ else }}false{{ end }}
 project_name: netbird
 builds:
   - id: netbird-wasm
@@ -256,8 +256,10 @@ dockers_v2:
        - ghcr.io/netbirdio/netbird
      tags:
        - "v{{ .Version }}-rootless"
-       - "{{ if not .IsNightly }}latest-rootless{{ end }}"
+       - "{{ if eq .Env.SKIP_PUBLISH \"false\" }}latest{{ end }}"
      dockerfile: client/Dockerfile-rootless
+     extra_files:
+       - client/netbird-entrypoint.sh
      platforms:
        - linux/amd64
        - linux/arm64
@@ -345,7 +347,7 @@ dockers_v2:
      tags:
        - "v{{ .Version }}"
        - "{{ if eq .Env.SKIP_PUBLISH \"false\" }}latest{{ end }}"
-     dockerfile: upload/Dockerfile
+     dockerfile: upload-server/Dockerfile
      platforms:
        - linux/amd64
        - linux/arm64