diff --git a/tasks/build/go.yml b/tasks/build/go.yml
index 5a5f11d..31bb9a3 100644
--- a/tasks/build/go.yml
+++ b/tasks/build/go.yml
@@ -9,7 +9,7 @@
 
 - name: set go Filename
   ansible.builtin.set_fact:
-    go_archive: "go{{ _go.version }}.linux-{{ arch }}.tar.gz"
+    go_archive: "go{{ _go.version }}.{{ ansible_system | lower }}-{{ arch }}.{{ _go.extmap[ansible_system] }}"
   tags:
     - dev
     - go
@@ -26,7 +26,7 @@
   ansible.builtin.get_url:
     dest: "{{ d_go_dl_tmp.path }}/{{ go_archive }}"
     url: "https://go.dev/dl/{{ go_archive }}"
-    checksum: "{{ _go[versions.go].Linux[arch] }}"
+    checksum: "{{ _go[_go.version][ansible_system][arch] }}"
     decompress: false
   tags:
     - dev
@@ -39,8 +39,18 @@
     state: directory
 
 - name: extract go package
-  become: true
   ansible.builtin.unarchive:
     dest: "{{ _go.install_path }}"
     src: "{{ d_go_dl_tmp.path }}/{{ go_archive }}"
     remote_src: true
+  when: ansible_system == 'Linux'
+  become: true
+
+- name: install go macOS use pkg file
+  ansible.builtin.command:
+    cmd: "installer -pkg {{ d_go_dl_tmp.path }}/{{ goFilename }} -target /"
+  when: ansible_system == 'Darwin'
+  become: true
+  tags:
+    - dev
+    - go
diff --git a/tasks/pkgs/Darwin/go.yml b/tasks/pkgs/Darwin/go.yml
index b90e79c..18c6cb8 100644
--- a/tasks/pkgs/Darwin/go.yml
+++ b/tasks/pkgs/Darwin/go.yml
@@ -1,38 +1,4 @@
 ---
-- ansible.builtin.include_vars:
-    file: go.yml
-    name: _go
-- name: set go arch
-  ansible.builtin.set_fact:
-    arch: "{{ _go.archmap[ansible_architecture] }}"
-
-- name: set go Filename
-  ansible.builtin.set_fact:
-    goFilename: "go{{ versions.go }}.darwin-{{ arch }}.pkg"
-  tags:
-    - dev
-    - go
-
-- name: create temp path
-  ansible.builtin.tempfile:
-    state: directory
-    prefix: go_dl.
-  register: d_go_dl_tmp
-
-- name: download latest go package for macOS
-  ansible.builtin.get_url:
-    dest: "{{ d_go_dl_tmp.path }}/{{ goFilename }}"
-    url: "https://go.dev/dl/{{ goFilename }}"
-    checksum: "{{ _go[versions.go].Darwin[arch] }}"
-    decompress: false
-  tags:
-    - dev
-    - go
-
-- name: install go macOS use pkg file
-  become: true
-  ansible.builtin.command:
-    cmd: "installer -pkg {{ d_go_dl_tmp.path }}/{{ goFilename }} -target /"
-  tags:
-    - dev
-    - go
+- name: append to pkgs
+  set_fact:
+    srcpkgs: "{{ srcpkgs + [ 'build/go.yml' ] }}"
diff --git a/tasks/pkgs/Debian/alacritty.yml b/tasks/pkgs/Debian/alacritty.yml
index 3e50c71..7d99e70 100644
--- a/tasks/pkgs/Debian/alacritty.yml
+++ b/tasks/pkgs/Debian/alacritty.yml
@@ -1,7 +1,7 @@
 ---
 - name: install rust and cargo
   ansible.builtin.include_tasks:
-    file: "{{ ansible_os_family }}/rust.yml"
+    file: "pkgs/{{ ansible_os_family }}/rust.yml"
   tags:
     - rust
     - dependency
@@ -17,6 +17,7 @@
       - libxkbcommon-dev
       - python3
 
-- name: add to syspkgs
+- name: add to pkgs
   ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + alacritty_deps }}"
+    srcpkgs: "{{ srcpkgs + ['build/alacritty.yml'] }}"
diff --git a/tasks/pkgs/Debian/go.yml b/tasks/pkgs/Debian/go.yml
index bc28383..18c6cb8 100644
--- a/tasks/pkgs/Debian/go.yml
+++ b/tasks/pkgs/Debian/go.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: append to pkgs
   set_fact:
-    srcpkgs: "{{ srcpkgs + [ 'packages/Linux/go.yml' ] }}"
+    srcpkgs: "{{ srcpkgs + [ 'build/go.yml' ] }}"
diff --git a/vars/go.yml b/vars/go.yml
index c4a504e..7f6a136 100644
--- a/vars/go.yml
+++ b/vars/go.yml
@@ -5,6 +5,9 @@ archmap:
   arm64: arm64
   aarch64: arm64
   x86_64: amd64
+extmap:
+  Darwin: pkg
+  Linux: tar.gz
 1.23.5:
   Darwin:
     arm64: sha256:f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df