diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e6bf46..0f8314d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,11 @@ build_firmware:
   image: python:3.9
   rules:
     - changes:
-      - "firmware/*"
+      - "controller/fw/*"
       - ".gitlab-ci.yml"
       when: on_success
   before_script:
-    - cd firmware/embed
+    - cd controller/fw/embed
     - pip install -U platformio
     - pio update
   script:
@@ -21,8 +21,8 @@ build_firmware:
     - pio run
   artifacts:
     paths:
-      - firmware/embed/.pio/build/robotroller_reborn/firmware.elf
-      - firmware/embed/.pio/build/robotroller_reborn/firmware.bin
+      - controller/fw/embed/.pio/build/robotroller_reborn/firmware.elf
+      - controller/fw/embed/.pio/build/robotroller_reborn/firmware.bin
     expire_in: 1 week
 
 lint_firmware:
@@ -30,11 +30,11 @@ lint_firmware:
   image: python:3.9
   rules:
     - changes:
-      - "firmware/*"
+      - "controller/fw/*"
       - ".gitlab-ci.yml"
       when: on_success
   before_script:
-    - cd firmware/embed/
+    - cd controller/fw/embed/
     - pip install cpplint
   script:
     - pwd
@@ -77,6 +77,6 @@ clone:
 Robotroller-PCB:
   variables:
     PACKAGE_NAME: 'Robotroller-PCB'
-    FOLDER: 'brd'
+    FOLDER: 'controller/hw'
     PROJECT_NAME: 'motor_controller_50mm'
   extends: .kicad-pipeline