diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index accd4b4..cddd048 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,32 +4,15 @@ before_script:
 
 # Defines stages which are to be executed
 stages:
-  - setup
   - build
   - upload
   - release
 
-setup:x86_64:
-  stage: setup
-  only:
-    - tags
-  script:
-    - wget 'https://git.pogmom.me/api/v4/projects/29/packages/generic/gowaybarplug/0.0.1-2/golang-github-lack-gowaybarplug-dev_0.0.1-2_amd64.deb'
-    - wget 'https://git.pogmom.me/api/v4/projects/30/packages/generic/gonetworkmanager/2.1.0-2/golang-github-wifx-gonetworkmanager-dev_2.1.0-2_amd64.deb'
-    - find . -maxdepth 1 -name '*.deb' -exec apt-get -y install {} \;
-    - find . -maxdepth 1 -name '*.deb' -delete
-
-setup:aarch64:
-  stage: setup
-  only:
-    - tags
-  script:
-    - wget 'https://git.pogmom.me/api/v4/projects/29/packages/generic/gowaybarplug/0.0.1-2/golang-github-lack-gowaybarplug-dev_0.0.1-2_arm64.deb'
-    - wget 'https://git.pogmom.me/api/v4/projects/30/packages/generic/gonetworkmanager/2.1.0-2/golang-github-wifx-gonetworkmanager-dev_2.1.0-2_arm64.deb'
-    - find . -maxdepth 1 -name '*.deb' -exec apt-get -y install {} \;
-    - find . -maxdepth 1 -name '*.deb' -delete
-
 .setup_script: &setup_scripts
+  - wget "https://git.pogmom.me/api/v4/projects/29/packages/generic/gowaybarplug/0.0.1-2/golang-github-lack-gowaybarplug-dev_0.0.1-2_$(dpkg --print-architecture).deb"
+  - wget "https://git.pogmom.me/api/v4/projects/30/packages/generic/gonetworkmanager/2.1.0-2/golang-github-wifx-gonetworkmanager-dev_2.1.0-2_$(dpkg --print-architecture).deb"
+  - find . -maxdepth 1 -name '*.deb' -exec apt-get -y install {} \;
+  - find . -maxdepth 1 -name '*.deb' -delete
   - apt-get update
   - apt-get -y build-dep .
   - apt-get -y install dpkg-dev
@@ -53,16 +36,12 @@ setup:aarch64:
 build:x86_64:
   <<: *compile
   stage: build
-  dependencies:
-    - setup:x86_64
   tags:
     - x86_64
 
 build:aarch64:
   <<: *compile
   stage: build
-  dependencies:
-    - setup:aarch64
   tags:
     - aarch64