diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbf09a2df50ff91bf22b3557f9378f3a65fc0f93..568318c8a22c825dfbd50b392ba2aa4ed3bed9d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -589,56 +589,56 @@ agent-test ocm-two:
 
 attestation-manager-test ocm:
   stage: deploy-test
-  extends: .test-agent-ocm-one
+  extends: .test-attestation-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "attestation-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 attestation-manager-test ocm-two:
   stage: deploy-test
-  extends: .test-agent-ocm-two
+  extends: .test-attestation-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "attestation-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 connection-manager-test ocm:
   stage: deploy-test
-  extends: .test-agent-ocm-one
+  extends: .test-connection-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "connection-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 connection-manager-test ocm-two:
   stage: deploy-test
-  extends: .test-agent-ocm-two
+  extends: .test-connection-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "connection-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 gateway-test ocm:
   stage: deploy-test
-  extends: .test-agent-ocm-one
+  extends: .test-gateway-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "gateway" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 gateway-test ocm-two:
   stage: deploy-test
-  extends: .test-agent-ocm-two
+  extends: .test-gateway-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "gateway" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 proof-manager-test ocm:
   stage: deploy-test
-  extends: .test-agent-ocm-one
+  extends: .test-proof-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "proof-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
 
 proof-manager-test ocm-two:
   stage: deploy-test
-  extends: .test-agent-ocm-two
+  extends: .test-proof-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "proof-manager" && $CI_PIPELINE_SOURCE != "merge_request_event"'
   when: manual
@@ -663,74 +663,60 @@ agent-prod ocm-two:
 
 attestation-manager-prod ocm:
   stage: deploy-prod
-  extends: .prod-agent-ocm-one
+  extends: .prod-attestation-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "attestation-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 attestation-manager-prod ocm-two:
   stage: deploy-prod
-  extends: .prod-agent-ocm-two
+  extends: .prod-attestation-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "attestation-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 connection-manager-prod ocm:
   stage: deploy-prod
-  extends: .prod-agent-ocm-one
+  extends: .prod-connection-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "connection-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 connection-manager-prod ocm-two:
   stage: deploy-prod
-  extends: .prod-agent-ocm-two
+  extends: .prod-connection-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "connection-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 gateway-prod ocm:
   stage: deploy-prod
-  extends: .prod-agent-ocm-one
+  extends: .prod-gateway-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "gateway" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 gateway-prod ocm-two:
   stage: deploy-prod
-  extends: .prod-agent-ocm-two
+  extends: .prod-gateway-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "gateway" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 proof-manager-prod ocm:
   stage: deploy-prod
-  extends: .prod-agent-ocm-one
+  extends: .prod-proof-manager-ocm-one
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "proof-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
 proof-manager-prod ocm-two:
   stage: deploy-prod
-  extends: .prod-agent-ocm-two
+  extends: .prod-proof-manager-ocm-two
   rules:
     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "proof-manager" && $CI_PIPELINE_SOURCE != "merge_request_event" && $MAIN_PROD == "yes" && $GITLAB_USER_LOGIN =~ $AUTORIZED_USERS'
   when: manual
 
-# engine-prod ocm:
-#   stage: deploy-prod
-#   extends: .prod-engine-ocm-one
-#   rules:
-#     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "engine"'
-#   when: manual
-
-# engine-prod ocm-two:
-#   stage: deploy-prod
-#   extends: .prod-engine-ocm-two
-#   rules:
-#     - if: '$PIPELINE_TRIGGERED == "yes" && $APP == "engine"'
-#   when: manual
-
 ##
 ### Deploy manual on Stage Environment
 ##