diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72a3692c..c80311ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,28 +11,43 @@ stages:
   - deploy
 
 clear-old-images:
+  tags:
+    - frontbuild
   extends: .clean_template
   variables:
-    STAGING_BRANCH: "main"
+    STAGING_BRANCH: "without-buttons"
     PRODUCTION_BRANCH: "main"
   image:
     name: docker/compose:1.28.0
     entrypoint: [""]
   before_script:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker images
   script:
     - docker system prune -af
 build-app:
+  tags:
+    - frontbuild
   extends: .build_template
   variables:
-    DOCKER_BUILD_PATH: "./Dockerfile"
-    STAGING_BRANCH: "main"
-    PRODUCTION_BRANCH: "main"
+    BRANCH: "without-buttons"
+  rules:
+  - if: "$CI_COMMIT_BRANCH == $BRANCH"
+  when: on_success
+  before_script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+  - docker build -t $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID --build-arg  GITLAB_TOKEN=$GITLAB_TOKEN $CI_PROJECT_DIR
+  - docker push $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
 
 deploy-to-staging:
+  tags:
+    - front
+    - prod
   extends: .deploy_template
   variables:
-    DEPLOY_TO: "staging"
-    BRANCH: "main"
-
+    BRANCH: "without-buttons"
+  rules:
+  - if: "$CI_COMMIT_BRANCH == $BRANCH"
+  script:
+  - docker login -u $REGISTRY_USER -p $REGISTRY_TOKEN $CI_REGISTRY
+  - docker-compose -f deployments/main/docker-compose.yaml up -d
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
new file mode 100644
index 00000000..ef3fc634
--- /dev/null
+++ b/deployments/main/docker-compose.yaml
@@ -0,0 +1,8 @@
+services:
+  squiz:
+    container_name: squiz
+    restart: unless-stopped
+    image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+    hostname: squiz
+    tty: true
+