diff --git a/packaging-ci.yml b/packaging-ci.yml
index bba816db99c75a1dc85b733c7c600d14cacbf481..d0797393d4305443923eb99139d2419c6053266a 100644
--- a/packaging-ci.yml
+++ b/packaging-ci.yml
@@ -1,16 +1,3 @@
-  # image: docker.io/labrobotica/labrobotica:latest
-
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-    FROM_RDEPENDS_CI: "false"
-    TAG_VERSION: $CI_COMMIT_TAG
-    PACKAGE_NAME: "package"
-
-  stages:
-    - build
-    - update_package
-    - update_reverse_dependencies
-
 ##### definitions #####
   .build_package: &build_package
     script:
@@ -54,29 +41,17 @@
     - git branch -D update_rdepends || echo "Update_depends branch already deleted"
     - git push origin --delete update_rdepends || echo "Update_depends branch already deleted"
 
-###################
-
-  test_work:
-    stage: build
-    script:
-      - echo "I work"
-      
-  build_package_tag:
-    stage: build
+  .build_package_tag: &build_package_tag
     rules:
       - if: $FROM_RDEPENDS_CI == "false" && $CI_COMMIT_TAG =~ /\d+\.[^a-zA-Z_\s]*\d+/ && $GITLAB_USER_NAME != "rdepends_token"
     <<: *build_package
 
-
-  update_repo_tag:
-    stage: update_package
+  .update_repo_tag: &update_repo_tag
     rules:
       - if: $FROM_RDEPENDS_CI == "false" && $CI_COMMIT_TAG =~ /\d+\.[^a-zA-Z_\s]*\d+/ && $GITLAB_USER_NAME != "rdepends_token"
     <<: *update_repo
 
-
-  modify_rdepends_ci:
-    stage: update_reverse_dependencies
+  .modify_rdepends_ci: &modify_rdepends_ci
     rules:
       - if: $FROM_RDEPENDS_CI == "false" && $CI_COMMIT_TAG =~ /\d+\.[^a-zA-Z_\s]*\d+/ && $GITLAB_USER_NAME != "rdepends_token"
     script:
@@ -113,46 +88,37 @@
       - git remote show origin
       - git push --set-upstream origin update_rdepends
 
-
-  cleanup_branch_on_failure2:
-    stage: update_reverse_dependencies
+  .cleanup_branch_on_failure2: &cleanup_branch_on_failure2
     rules:
       - if: $FROM_RDEPENDS_CI == "false" && $CI_COMMIT_TAG =~ /\d+\.[^a-zA-Z_\s]*\d+/ && $GITLAB_USER_NAME != "rdepends_token"
         when: on_failure
     script:
       - *cleanup
-    needs: [modify_rdepends_ci]
+    needs: [modify-rdepends-ci]
 
-
-  trigger_rdepends_ci:
-    stage: update_reverse_dependencies
+  .trigger_rdepends_ci: &trigger_rdepends_ci
     rules:
       - if: $CI_COMMIT_BRANCH == "update_rdepends"
     trigger:
       include: .rdepends_ci/rdepends_ci.yml
       strategy: depend
 
-
-  cleanup_branch:
-    stage: update_reverse_dependencies
+  .cleanup_branch: &cleanup_branch
     rules:
       - if: $CI_COMMIT_BRANCH == "update_rdepends"
     script:
       - *cleanup
-    needs: [trigger_rdepends_ci]
+    needs: [trigger-rdepends-ci]
 
-  cleanup_branch_on_failure:
-    stage: update_reverse_dependencies
+  .cleanup_branch_on_failure: &cleanup_branch_on_failure
     rules:
       - if: $CI_COMMIT_BRANCH == "update_rdepends"
         when: on_failure
     script:
       - *cleanup
-    needs: [trigger_rdepends_ci]
+    needs: [trigger-rdepends-ci]
 
-
-  generate_new_tag:
-    stage: update_reverse_dependencies
+  .generate_new_tag: &generate_new_tag
     rules:
       - if: $FROM_RDEPENDS_CI == "true"
     script:
@@ -177,17 +143,16 @@
       - git remote show origin
       - git push origin $TAG_VERSION
 
-  build_package_rdep:
-    stage: update_reverse_dependencies
+  .build_package_rdep: &build_package_rdep
     rules:
       - if: $FROM_RDEPENDS_CI == "true"
-    needs: [generate_new_tag]
+    needs: [generate-new-tag]
     <<: *build_package
 
-
-  update_repo_rdep:
-    stage: update_reverse_dependencies
+  .update_repo_rdep: &update_repo_rdep
     rules:
       - if: $FROM_RDEPENDS_CI == "true"
-    needs: [build_package_rdep]
+    needs: [build-package-rdep]
     <<: *update_repo
+
+###################