diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a92f54a..631fc0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,11 +108,6 @@ branch_build_release_for_x86_64_rocky8:
   extends: .build_for_x86_64_rocky8
   variables:
     BUILD_TYPE: RelWithDebInfo
-  artifacts:
-    name: "stellar-branch_build-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*    
-    expire_in: 1h  
   except:
     - /^develop-.*$/i
     - /^release-.*$/i
@@ -134,11 +129,6 @@ develop_build_release_for_x86_64_rocky8:
     TESTING_VERSION_BUILD: 1
     BUILD_TYPE: RelWithDebInfo
     #ASAN_OPTION: ADDRESS
-  artifacts:
-    name: "stellar-develop_build-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*        
-    expire_in: 1h    
   only:
     - /^develop-.*$/i
     - /^release-.*$/i
@@ -157,7 +147,7 @@ release_build_release_for_x86_64_rocky8:
   artifacts:
     name: "stellar-release_build-$CI_COMMIT_REF_NAME-release"
     paths:
-      - build/*
+      - build/infra/*.rpm
     expire_in: 1h    
   only:
     - tags
@@ -183,11 +173,6 @@ branch_build_release_for_aarch64_rocky9:
   extends: .build_for_aarch64_rocky9
   variables:
     BUILD_TYPE: RelWithDebInfo
-  artifacts:
-    name: "stellar-branch_build-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*    
-    expire_in: 1h    
   except:
     - /^develop-.*$/i
     - /^release-.*$/i
@@ -209,11 +194,6 @@ develop_build_release_for_aarch64_rocky9:
     TESTING_VERSION_BUILD: 1
     BUILD_TYPE: RelWithDebInfo
     #ASAN_OPTION: ADDRESS
-  artifacts:
-    name: "stellar-develop_build-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*        
-    expire_in: 1h    
   only:
     - /^develop-.*$/i
     - /^release-.*$/i
@@ -232,7 +212,7 @@ release_build_release_for_aarch64_rocky9:
   artifacts:
     name: "stellar-release_build-$CI_COMMIT_REF_NAME-release"
     paths:
-      - build/*
+      - build/infra/*.rpm
     expire_in: 1h    
   only:
     - tags
@@ -243,10 +223,17 @@ release_build_release_for_aarch64_rocky9:
 .setup_test_env:
   stage: test
   allow_failure: false
-  before_script:
-    - *everything_before_script
+  before_script: *everything_before_script
   script:
-    - cd build; ctest -V
+    - mkdir build || true
+    - cd build
+    - >
+      cmake3 -DCMAKE_CXX_FLAGS=$CXX_FLAGS 
+      -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+      -DASAN_OPTION=$ASAN_OPTION 
+      -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX 
+      -DVERSION_DAILY_BUILD=$TESTING_VERSION_BUILD ..
+    - make -j4 VERBOSE=1
 
 test_for_x86_64_rocky8:
   extends: .setup_test_env