diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01aaa0036b30ade82381bf6b4ad7a672f38402ac..a8b5d7b4381eca28755b8ab3a953bffec864edae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,67 @@
 stages:
-  - Setup
-  - Triggers
+  - Code Checks
+  - Simulation
+  - Test Builds
+  - Hardware Tests
+  - Full Builds
 
-generate-config:
-  stage: Setup
-  image: python
-  before_script:
-    - pip install pyyaml
+
+Lint HDL Code:
+  stage: Code Checks
+  image: ubuntu
+  script:
+    - echo "Code checks go here."
+  
+Front End Unit Tests:
+  stage: Simulation
+  image: ubuntu
   script:
-    - cd ci/
-    - python generate-configs.py
-    - cat configure-ci.yml
-  artifacts:
-    paths:
-      - ci/configure-ci.yml
+    - echo "Unit tests go here"
+  
+B186 VU13P Build:
+  stage: Test Builds
+  variables:
+    PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
+    DTC_BRANCH: 40-ci-building-designs-in-main-repository
+  trigger:
+    project: cms-tracker-phase2-data-processing/BE_firmware/ot-dtc-deployments/b186-z1.2
+    strategy: depend
 
-build:
-  stage: Triggers
+Test on SerenityM:
+  stage: Hardware Tests
+  image: ubuntu
+  script:
+    - echo "Hardware tests go here"
+  
+Serenity S1 2S Full Design:
+  stage: Full Builds
+  when: manual
   variables:
     PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
+    DTC_BRANCH: 40-ci-building-designs-in-main-repository
   trigger:
-    include:
-      - artifact: ci/configure-ci.yml
-        job: generate-config
+    project: cms-tracker-phase2-data-processing/BE_firmware/ot-dtc-deployments/serenity-s1-2s-full
     strategy: depend
+
+# generate-config:
+#   stage: Setup
+#   image: python
+#   before_script:
+#     - pip install pyyaml
+#   script:
+#     - cd ci/
+#     - python generate-configs.py
+#     - cat configure-ci.yml
+#   artifacts:
+#     paths:
+#       - ci/configure-ci.yml
+
+# build:
+#   stage: Triggers
+#   variables:
+#     PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
+#   trigger:
+#     include:
+#       - artifact: ci/configure-ci.yml
+#         job: generate-config
+#     strategy: depend