diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ada935..e45b68d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,95 +1,68 @@
 stages:
-  - cmake
   - build
   - post
 
 # Unix Build
-cmake:
-  stage: cmake
-  image: luki42/dynuiprefresher_build:latest
-  script:
-    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
-  artifacts:
-    paths:
-      - build/
-      - inc/
-      - postinst
-
 build:
   stage: build
   image: luki42/dynuiprefresher_build:latest
   script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
     - cd build
     - make dynuiprefresher
   artifacts:
     paths:
-      - build/
-      - inc/
-      - postinst
-  dependencies:
-    - cmake
+      - build/bin/
 
 
 build_package:
   stage: post
   image: luki42/dynuiprefresher_build:latest
   script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
     - cd build
     - make package
   artifacts:
     paths:
-      - build/
-      - inc/
-      - postinst
-  dependencies:
+      - build/packages/
+  needs:
     - build
 
 test:
   stage: post
   image: luki42/dynuiprefresher_build:latest
   script:
+    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
     - cd build
     - make build-test
   artifacts:
     reports:
       junit: build/*.xml
-  dependencies:
+  needs:
     - build
 
 # Windows Build
-cmake_win64:
-  stage: cmake
-  image: luki42/dynuiprefresher_build:windows
-  script:
-    - cmake -S . -B build -D WinBuild=ON
-  artifacts:
-    paths:
-      - build/
-      - inc/
-
 build_win64:
   stage: build
   image: luki42/dynuiprefresher_build:windows
   script:
+    - cmake -S . -B build -D WinBuild=ON
     - cd build
     - make dynuiprefresher
   artifacts:
     paths:
-      - build/
-      - inc/
-  dependencies:
-    - cmake_win64
+      - build/bin/
 
 
 build_package_win64:
   stage: post
   image: luki42/dynuiprefresher_build:windows
   script:
+    - cmake -S . -B build -D WinBuild=ON
     - cd build
     - make package
   artifacts:
     paths:
-      - build/
-      - inc/
-  dependencies:
+      - build/packages/
+  needs:
     - build_win64
\ No newline at end of file