diff --git a/.cicd/package.sh b/.cicd/package.sh
index a45be05a12f..5cc836fdb85 100755
--- a/.cicd/package.sh
+++ b/.cicd/package.sh
@@ -29,15 +29,15 @@ else # Linux
 
     . $HELPERS_DIR/docker-hash.sh
 
-    PACKAGE_COMMANDS="./generate_package.sh $PACKAGE_TYPE"
 
     if [[ "$IMAGE_TAG" =~ "ubuntu" ]]; then
         ARTIFACT='*.deb'
         PACKAGE_TYPE='deb'
+        PACKAGE_COMMANDS="./generate_package.sh $PACKAGE_TYPE"
     elif [[ "$IMAGE_TAG" =~ "centos" ]]; then
         ARTIFACT='*.rpm'
         PACKAGE_TYPE='rpm'
-        PACKAGE_COMMANDS="mkdir -p ~/rpmbuild/BUILD && mkdir -p ~/rpmbuild/BUILDROOT && mkdir -p ~/rpmbuild/RPMS && mkdir -p ~/rpmbuild/SOURCES && mkdir -p ~/rpmbuild/SPECS && mkdir -p ~/rpmbuild/SRPMS && yum install -y rpm-build && $PACKAGE_COMMANDS"
+        PACKAGE_COMMANDS="mkdir -p ~/rpmbuild/BUILD && mkdir -p ~/rpmbuild/BUILDROOT && mkdir -p ~/rpmbuild/RPMS && mkdir -p ~/rpmbuild/SOURCES && mkdir -p ~/rpmbuild/SPECS && mkdir -p ~/rpmbuild/SRPMS && yum install -y rpm-build && ./generate_package.sh $PACKAGE_TYPE"
     fi
 
     COMMANDS="$PRE_COMMANDS && $PACKAGE_COMMANDS"
diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml
index c90bca43428..33a6d94bd87 100644
--- a/.cicd/pipeline.yml
+++ b/.cicd/pipeline.yml
@@ -229,7 +229,7 @@ steps:
   #   timeout: 10
   #   soft_fail: true
 
-  # - wait
+  - wait
 
   # - label: ":ubuntu: Ubuntu 18.04 - Contract Builder"
   #   command: