diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c49d21577563ec29bef87eac11f84a53ded155ab..42f9a89acb11e858a80d9fa85d76b491dd98be59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,18 +14,17 @@ stages:
 
 variables:
   PROJECT_NAME: "landing"
-  ARTIFACT_FILENAME: build
+  BUILD_DIR: build
+  NODE_IMAGE_TAG: node:21
 
 include:
   - project: "og/gitlab-infra"
     ref: "development"
     file:
       - "templates/deploy/s3-deploy.yml"
-      - "templates/build/build-node-img.yml"
-      - "templates/build/build-node-npm.yml"
+      - "templates/build/install-build-npm.yml"
       - "templates/tests/npm-test.yml"
 
-  - local: .gitlab/base.yml
   - local: .gitlab/development.yml
     rules:
       - if: $CI_COMMIT_BRANCH != "production"
diff --git a/.gitlab/base.yml b/.gitlab/base.yml
deleted file mode 100644
index 797d82489e8bb64d38095cbe778b1d544163bc37..0000000000000000000000000000000000000000
--- a/.gitlab/base.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-enable-force-rebuild:
-  extends: [.enable-force-rebuild]
-  stage: force-rebuild
-  rules:
-    - changes:
-        - package*json
-        - docker/Dockerfile.node_builder
-
-
-build-node-img:
-  extends: [.build-node-img]
-  stage: install
-  variables:
-    IMAGE_NAME: '${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}'
-    GIT_SUBMODULE_STRATEGY: none
-    PATH_DOCKERFILE: ./docker/Dockerfile.node_builder
diff --git a/.gitlab/development.yml b/.gitlab/development.yml
index 22ee95d6235f0e27fa7f2540052610299d4879c1..8dbae85e89e279d8ab90d432dbaeebd59a8d3a94 100644
--- a/.gitlab/development.yml
+++ b/.gitlab/development.yml
@@ -8,24 +8,25 @@
 
 
 build-stand:
-  extends: [.build-node-npm]
+  extends: [.install-build-npm]
   stage: build
+  image: ${NODE_IMAGE_TAG}
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    CI: ''
+    NPM_BUILD_CMD: 'npm run build'
+    ENV_FILE: ${ENV_FILE_DEV}
   artifacts:
     paths:
-      - ${ARTIFACT_FILENAME}
+      - ${BUILD_DIR}
     expire_in: 1 day
-  variables:
-    ENV_FILE: ${ENV_FILE_DEV}
-    NODE_IMAGE_TAG: '${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}'
-  needs:
-    - build-node-img
 
 
 deploy-stand:
   extends: [.s3-deploy]
   variables:
     S3_BUCKET: dev-static-br/${PROJECT_NAME}/${CI_COMMIT_BRANCH}
-    LOCAL_DIR: ${ARTIFACT_FILENAME}
+    LOCAL_DIR: ${BUILD_DIR}
     AWSCLI_SUFFIX: '--delete'
   needs:
     - job: build-stand
@@ -44,16 +45,18 @@ deploy-stand:
 
 
 build-local:
-  extends: [.build-node-npm]
+  extends: [.install-build-npm]
   stage: build
+  image: ${NODE_IMAGE_TAG}
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    CI: ''
+    NPM_BUILD_CMD: 'npm run build'
+    ENV_FILE: ${ENV_FILE_LOCAL}
   artifacts:
     paths:
-      - ${ARTIFACT_FILENAME}
+      - ${BUILD_DIR}
     expire_in: 7 days
-  variables:
-    ENV_FILE: ${ENV_FILE_LOCAL}
-  needs:
-    - build-node-img
   when: manual
 
 
@@ -61,7 +64,7 @@ deploy-local:
   extends: [.s3-deploy]
   variables:
     S3_BUCKET: dev-static-br/${PROJECT_NAME}/local
-    LOCAL_DIR: ${ARTIFACT_FILENAME}
+    LOCAL_DIR: ${BUILD_DIR}
     AWSCLI_SUFFIX: '--delete'
   needs:
     - job: build-local
diff --git a/.gitlab/production.yml b/.gitlab/production.yml
index c788b677f97d944846a06a5ddfdb0466ecccbd9f..8d513fc3279ae474d5fccd34818627812f047baf 100644
--- a/.gitlab/production.yml
+++ b/.gitlab/production.yml
@@ -1,16 +1,17 @@
 build-prod:
-  extends: [.build-node-npm]
+  extends: [.install-build-npm]
   stage: build
-  when: manual
+  image: ${NODE_IMAGE_TAG}
   variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    CI: ''
+    NPM_BUILD_CMD: 'npm run build'
     ENV_FILE: ${ENVFILE_PROD}
-    NODE_IMAGE_TAG: '${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}'
   artifacts:
     paths:
-      - build
+      - ${BUILD_DIR}
     expire_in: 30 days
-  needs:
-    - build-node-img
+  when: manual
 
 
 deploy-prod:
@@ -18,9 +19,10 @@ deploy-prod:
   when: manual
   variables:
     S3_BUCKET: "sites-static/biorich/landing"
+    LOCAL_DIR: ${BUILD_DIR}
     AWSCLI_SUFFIX: '--delete'
   needs:
     - job: build-prod
       artifacts: true
-    - job: test-prod
-      artifacts: false
+    # - job: test-prod
+    #   artifacts: false
diff --git a/docker/Dockerfile.node_builder b/docker/Dockerfile.node_builder
deleted file mode 100644
index a3a43b5710f06b2333e6bccde4cb2ffcf172d8b1..0000000000000000000000000000000000000000
--- a/docker/Dockerfile.node_builder
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM node:21
-COPY ./package*json .
-RUN npm install