diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cdee3467f0b143d490905ef342aaf493d83570a..9699ed9571c1665bbfd2607606d6d76a02e6ab1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,15 +15,17 @@ build:
   script:
     - npm install
     - ng build --prod --base-href /degree-planner --deploy-url /degree-planner/
+    - VERSION=$(node -p -e "require('./package.json').version")
+    - tar czf ./course-search-enroll-fe-$VERSION.tar.gz -C dist/course-search-enroll-fe ./
+    - aws s3 cp ./course-search-enroll-fe-$VERSION.tar.gz s3://enroll-app-front-end-builds/course-search-enroll-fe-$VERSION.tar.gz
 
 deploy:
   stage: deploy
   script:
-    - npm install
-    - npm version patch && node ./update-version.js
-    - ng build --prod --base-href /degree-planner --deploy-url /degree-planner/
-    - aws s3 sync --acl public-read --sse --delete dist/course-search-enroll-fe s3://$S3_BUCKET_NAME
-    - aws configure set preview.cloudfront true
+    - VERSION=$(node -p -e "require('./package.json').version")
+    - aws s3 cp s3://enroll-app-front-end-builds/course-search-enroll-fe-$VERSION.tar.gz ./course-search-enroll-fe-$VERSION.tar.gz
+    - mkdir build && tar xzf ./course-search-enroll-fe-$VERSION.tar.gz -C build
+    - aws s3 sync --acl public-read --sse --delete build s3://$DEV_S3_BUCKET_NAME
     - aws cloudfront create-invalidation --distribution-id $DEV_CFDIST_ID --paths '/*'
   only:
     - master@adi-ia/course-search-enroll-fe
@@ -31,10 +33,10 @@ deploy:
 deploy_test:
   stage: deploy
   script:
-    - npm install
-    - ng build --prod --base-href /degree-planner --deploy-url /degree-planner/
-    - aws s3 sync --acl public-read --sse --delete dist/course-search-enroll-fe s3://$TEST_S3_BUCKET_NAME
-    - aws configure set preview.cloudfront true
+    - VERSION=$(node -p -e "require('./package.json').version")
+    - aws s3 cp s3://enroll-app-front-end-builds/course-search-enroll-fe-$VERSION.tar.gz ./course-search-enroll-fe-$VERSION.tar.gz
+    - mkdir build && tar xzf ./course-search-enroll-fe-$VERSION.tar.gz -C build
+    - aws s3 sync --acl public-read --sse --delete build s3://$TEST_S3_BUCKET_NAME
     - aws cloudfront create-invalidation --distribution-id $TEST_CFDIST_ID --paths '/*'
   only:
     - master@adi-ia/course-search-enroll-fe