diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e17a15..c54b972 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,43 @@
 stages:
   - build
+  - deploy
 
-build-code-job:
+build-job:
   stage: build
   tags:
     - build
     - node
   script:
-    - echo "Run 'npm build' and deploy to server"
+    - npm install
+    - ng build --prod --configuration=production
+  artifacts:
+    paths:
+      - dist/
+  only:
+    - master
 
+deploy-job:
+  stage: deploy    
+  tags:
+    - deploy
+    - node
+  when: manual
+  environment:
+    name: Production
+    url: "$Live_Server_IP"
+  before_script:
+  - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y)'
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
+  script:
+    - ssh gitlab@"$Live_Server_Ip" -p 10122 "touch test"
+  # script:
+  #   - tar zcf ../angularproject.tar.gz ./dist
+  #   - ssh-add < (echo "$Live_Server_Private_Key")
+  #   - scp -o StrictHostKeyChecking=no ../angularproject.tar.gz root@"$Live_Server_IP":/var/www/html/inkletblot-com
+  #   - ssh-add < (echo "$Live_Server_Private_Key")
+  #   - ssh root@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com/angularproject_old && mv /var/www/html/inkletblot-com/angularproject /var/www/html/inkletblot-com/angularproject_old && mkdir /var/www/html/inkletblot-com/angularproject_build && mkdir /var/www/html/inkletblot-com/angularproject && tar zxf /var/www/html/inkletblot-com/angularproject.tar.gz -C /var/www/html/inkletblot-com/angularproject_build && mv /var/www/html/inkletblot-com/angularproject_build/dist/angularproject/* /var/www/html/inkletblot-com/angularproject && rm -Rf /var/www/html/inkletblot-com/angularproject_build && chmod -R 755 /var/www/html/inkletblot-com/angularproject && exit"
+  only:
+    - master
\ No newline at end of file