diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b17169..6d50724 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ variables:
 
 stages:
 - build
+- envelope
+- upload
 
 .build_by_travis:
   before_script:
@@ -109,3 +111,37 @@ release_build_release:
       - build/*.rpm
   only:
     - tags
+
+envelope_rpm:
+  stage: envelope
+  variables:
+    FEATURE_ID: 100
+    APP_NAME_IN_RPM_SPEC: tfe
+  script:
+    - export RPM_FULL_PATH=`ls $CI_PROJECT_DIR/build/*.rpm | grep -v debug | grep -v debuginfo | grep -v devel | head -n 1`
+    - export BIN_TO_PROTECT_IN_RPM="${INSTALL_PREFIX}/bin/tfe"
+    - /root/rebuildrpm_and_envelope.sh $RPM_FULL_PATH $BIN_TO_PROTECT_IN_RPM $FEATURE_ID $APP_NAME_IN_RPM_SPEC
+  tags:
+    - envelope
+  artifacts:
+    name: "tfe-pr-$CI_COMMIT_REF_NAME-release"
+    paths:
+      - build/*-pr-*.rpm
+  only:
+    - tags
+  
+upload_envelope_rpm:
+  stage: upload
+  variables:
+    PULP3_REPO_NAME: tfe-stable-x86_64.el7
+    PULP3_DIST_NAME: tfe-stable-x86_64.el7
+  script:
+    - cd $CI_PROJECT_DIR/build/
+    - ls -ahl *.rpm
+    - cp ~/rpm_upload_tools.py ./
+    - python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *-pr-*.rpm
+    - rm -rf *.rpm
+  tags:
+    - share
+  only:
+    - tags
diff --git a/ci/travis.sh b/ci/travis.sh
index 19470d9..7744474 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -57,7 +57,7 @@ make
 make test
 
 if [ -n "${PACKAGE}" ]; then
-	make package
+  make package
 	cp ~/rpm_upload_tools.py ./
 	python3 rpm_upload_tools.py ${PULP3_REPO_NAME} ${PULP3_DIST_NAME} *.rpm
 fi