diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index bd27419a8..457674e9a 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -65,6 +65,7 @@ archives:
         dst: licenses/
       - src: "DISCLAIMER"
         dst: DISCLAIMER
+    wrap_in_directory: true
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -79,6 +80,7 @@ changelog:
 source:
   enabled: true
   name_template: apache-answer-{{ .RawVersion }}-incubating-src
+  prefix_template: "apache-answer-{{ .RawVersion }}-incubating-src/"
 
 # goreleaser release --skip-validate  --skip-publish --clean