diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml
index a8bb68e5c..1cf6115ae 100644
--- a/.goreleaser-linux.yml
+++ b/.goreleaser-linux.yml
@@ -610,11 +610,7 @@ archives:
       - vpn-server-riscv64
       - vpn-client-riscv64
 
-<<<<<<< HEAD
   - id: deployment-amd64
-=======
-  - id: amd64
->>>>>>> develop
     format: tar.gz
     wrap_in_directory: false
     name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
@@ -624,11 +620,7 @@ archives:
     builds:
       - skywire-deployment-amd64
 
-<<<<<<< HEAD
   - id: deployment-arm64
-=======
-  - id: arm64
->>>>>>> develop
     format: tar.gz
     wrap_in_directory: false
     name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
@@ -638,11 +630,7 @@ archives:
     builds:
       - skywire-deployment-arm64
 
-<<<<<<< HEAD
   - id: deployment-arm
-=======
-  - id: arm
->>>>>>> develop
     format: tar.gz
     wrap_in_directory: false
     name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
@@ -652,28 +640,20 @@ archives:
     builds:
       - skywire-deployment-arm
 
-<<<<<<< HEAD
   - id: deployment-armhf
-=======
-  - id: armhf
->>>>>>> develop
     format: tar.gz
     wrap_in_directory: false
-    name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}hf'
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}hf'
     files:
       - dmsghttp-config.json
       - services-config.json
     builds:
       - skywire-deployment-armhf
 
-<<<<<<< HEAD
   - id: deployment-riscv64
-=======
-  - id: riscv64
->>>>>>> develop
     format: tar.gz
     wrap_in_directory: false
-    name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
       - services-config.json