diff --git a/goreleaser-extended.yml b/goreleaser-extended.yml
index 2fc69a68f..31b52d7ba 100644
--- a/goreleaser-extended.yml
+++ b/goreleaser-extended.yml
@@ -47,6 +47,7 @@ nfpm:
   maintainer: "Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>"
   description: "A Fast and Flexible Static Site Generator built with love in GoLang."
   license: "Apache 2.0"
+  name_template: "{{.ProjectName}}_{{.Version}}_{{.Os}}-{{.Arch}}"
   replacements:
     amd64: 64bit
     386: 32bit
diff --git a/goreleaser.yml b/goreleaser.yml
index 6c70e469d..0f38764ac 100644
--- a/goreleaser.yml
+++ b/goreleaser.yml
@@ -1,3 +1,4 @@
+project_name: hugo
 build:
   main: main.go
   binary: hugo
@@ -21,21 +22,33 @@ build:
     - goos: openbsd
       goarch: arm
       goarm: 6
-
-fpm:
+nfpm:
   formats:
-      - deb
+    - deb
   vendor: "gohugo.io"
   homepage: "https://gohugo.io/"
   maintainer: "Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>"
   description: "A Fast and Flexible Static Site Generator built with love in GoLang."
   license: "Apache 2.0"
+  name_template: "{{.ProjectName}}_{{.Version}}_{{.Os}}-{{.Arch}}"
+  replacements:
+    amd64: 64bit
+    386: 32bit
+    arm: ARM
+    arm64: ARM64
+    darwin: macOS
+    linux: Linux
+    windows: Windows
+    openbsd: OpenBSD
+    netbsd: NetBSD
+    freebsd: FreeBSD
+    dragonfly: DragonFlyBSD
 archive:
   format: tar.gz
   format_overrides:
     - goos: windows
       format: zip
-  name_template: "{{.Binary}}_{{.Version}}_{{.Os}}-{{.Arch}}"
+  name_template: "{{.ProjectName}}_{{.Version}}_{{.Os}}-{{.Arch}}"
   replacements:
     amd64: 64bit
     386: 32bit