diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a27c15fa..c3a6327b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,18 +7,18 @@ variables:
   COMPOSE_DOCKER_CLI_BUILD: "1"
   DOCKER_DRIVER: overlay2
 
-  IMAGE_TAG: "staging_${CI_COMMIT_SHORT_SHA}"
+  IMAGE_TAG: "stg-ec2_${CI_COMMIT_SHORT_SHA}"
   IMAGE_NAME: "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}"
-  IMAGE_LATEST_STAGING: "${CI_REGISTRY_IMAGE}:staging_latest"
+  IMAGE_LATEST_stg-ec2: "${CI_REGISTRY_IMAGE}:stg-ec2_latest"
 
-build:staging:
+build:stg-ec2:
   stage: build
   image: docker:27.0.3
   services:
     - name: docker:27.0.3-dind
       command: ["--mtu=1460"]
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_COMMIT_BRANCH == "stg-ec2"'
 
   before_script:
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
@@ -27,8 +27,8 @@ build:staging:
     - docker build -t "$IMAGE_NAME" -f Dockerfile .
     - docker push "$IMAGE_NAME"
 
-    - docker tag "$IMAGE_NAME" "$IMAGE_LATEST_STAGING"
-    - docker push "$IMAGE_LATEST_STAGING"
+    - docker tag "$IMAGE_NAME" "$IMAGE_LATEST_stg-ec2"
+    - docker push "$IMAGE_LATEST_stg-ec2"
 
   after_script:
     - docker system prune -af || true
@@ -36,12 +36,12 @@ build:staging:
 # =========================
 # DEPLOY: Server pull image + docker compose up
 # =========================
-# deploy:staging:
+# deploy:stg-ec2:
 #   stage: deploy
 #   image: alpine:3.20
 #   rules:
-#     - if: '$CI_COMMIT_BRANCH == "staging"'
-#   needs: ["build:staging"]
+#     - if: '$CI_COMMIT_BRANCH == "stg-ec2"'
+#   needs: ["build:stg-ec2"]
 
 #   before_script:
 #     - apk add --no-cache openssh-client bash curl ca-certificates
@@ -58,11 +58,11 @@ build:staging:
 
 #   script:
 #     - echo "Deploy on server: $SERVER_USER@$SERVER_IP"
-#     - echo "Target dir: /docker/deployment/staging/stg-lti-api"
+#     - echo "Target dir: /docker/deployment/stg-ec2/stg-lti-api"
 #     - |
 #       ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
 #         set -e
-#         cd /docker/deployment/staging/stg-lti-api
+#         cd /docker/deployment/stg-ec2/stg-lti-api
 
 #         echo 'Login registry on server...'
 #         echo '$CI_REGISTRY_PASSWORD' | docker login -u '$CI_REGISTRY_USER' --password-stdin '$CI_REGISTRY'
@@ -76,6 +76,3 @@ build:staging:
 #         echo 'Cleanup old images...'
 #         docker image prune -af --filter 'until=168h' || true
 #       "
-
-  environment:
-    name: stg-ec2
\ No newline at end of file