diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76452a7..a3910d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,16 @@
+include:
+  - project: "devops/pena-continuous-integration"
+    file: "/templates/docker/build-template.gitlab-ci.yml"
+  - project: "devops/pena-continuous-integration"
+    file: "/templates/docker/deploy-template.gitlab-ci.yml"
 stages:
   - build
   - deploy
 
 build-app:
   stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
+  tags:
+    - gobuild
   variables:
     DOCKER_BUILD_PATH: "./Dockerfile"
     STAGING_BRANCH: "staging"
@@ -24,32 +28,21 @@ build-app:
     - echo CI_COMMIT_REF_SLUG = $CI_COMMIT_REF_SLUG
     - echo DOCKER_BUILD_PATH = $DOCKER_BUILD_PATH
     - echo CI_PIPELINE_ID = $CI_PIPELINE_ID
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - mkdir -p /kaniko/.docker
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - |
-      /kaniko/executor --context $CI_PROJECT_DIR \
-      --cache=true --cache-repo=$CI_REGISTRY_IMAGE \
-      --dockerfile $CI_PROJECT_DIR/$DOCKER_BUILD_PATH --target production \
-      --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID --build-arg  GITLAB_TOKEN=$GITLAB_TOKEN $CI_PROJECT_DIR
+    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+
+
+
 
 deploy-to-staging:
   stage: deploy
-  image:
-    name: docker/compose:1.28.0
-    entrypoint: [""]
+  extends: .deploy_template
   variables:
     DEPLOY_TO: "staging"
     BRANCH: "staging"
   rules:
-    - if: $CI_COMMIT_BRANCH == $BRANCH
-  before_script:
-    - echo CI_PROJECT_NAME = $CI_PROJECT_NAME
-    - echo CI_REGISTRY = $CI_REGISTRY
-    - echo REGISTRY_USER = $REGISTRY_USER
-    - echo REGISTRY_TOKEN = $REGISTRY_TOKEN
-    - echo DEPLOY_TO = $DEPLOY_TO
-    - echo BRANCH = $BRANCH
-  script:
-    - docker login -u $REGISTRY_USER -p $REGISTRY_TOKEN $CI_REGISTRY
-    - docker-compose -f deployments/$DEPLOY_TO/docker-compose.yaml up -d
+  - if: "$CI_COMMIT_BRANCH == $BRANCH"
+
+
diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml
index 479614e..dfe4e3f 100644
--- a/deployments/staging/docker-compose.yaml
+++ b/deployments/staging/docker-compose.yaml
@@ -37,9 +37,4 @@ services:
       - 8065:8065
       - 9065:9065
     networks:
-      - marketplace_penahub_frontend
       - default
-
-networks:
-  marketplace_penahub_frontend:
-    external: true
\ No newline at end of file