diff --git a/.gitlab.mk b/.gitlab.mk
index bfec4a9476fdc416e5b99a4dd16d8da6f4ffedb2..5f7b224914a6f4b99a37277cb022f13f941c7791 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -100,7 +100,7 @@ S3_SOURCE_REPO_URL=s3://tarantool_repo/sources
 endif
 
 RWS_BASE_URL=https://rws.tarantool.org
-RWS_ENDPOINT=${RWS_BASE_URL}/${REPO_TYPE}/${TARANTOOL_SERIES}/${OS}/${DIST}
+PRODUCT_NAME=tarantool
 
 deploy_prepare:
 	rm -rf packpack
@@ -109,15 +109,6 @@ deploy_prepare:
 	rm -rf build
 
 package: deploy_prepare
-	# Set PRODUCT_NAME for the package itself.
-	if [ "$$(echo $(GC64) | sed 's/.*=//')" = ON ]; then                                                           \
-		export PRODUCT_NAME=tarantool-gc64; \
-		if [ "${OS}" = "ubuntu" ] || [ "${OS}" = "debian" ]; then \
-		    $$(sed -i'' -e 's/Package: tarantool$$/Package: tarantool-gc64/' debian/control); \
-		fi; \
-	else \
-		export PRODUCT_NAME=tarantool; \
-	fi; \
 	if [ -n "$(GIT_TAG)" ]; then                                                                                    \
 		export VERSION="$$(echo $(GIT_TAG) | sed 's/-/~/')";                                                    \
 	else                                                                                                            \
@@ -126,18 +117,18 @@ package: deploy_prepare
 	echo VERSION=$$VERSION;                                                                                         \
 	PACKPACK_EXTRA_DOCKER_RUN_PARAMS="--network=host ${PACKPACK_EXTRA_DOCKER_RUN_PARAMS}"                           \
 	TARBALL_EXTRA_ARGS="--exclude=*.exe --exclude=*.dll"                                                            \
-	PRESERVE_ENVVARS="PRODUCT_NAME,TARBALL_EXTRA_ARGS,${PRESERVE_ENVVARS}" ./packpack/packpack
+	PRESERVE_ENVVARS="TARBALL_EXTRA_ARGS,${PRESERVE_ENVVARS}" ./packpack/packpack
 
 deploy:
 	if [ -z "${REPO_TYPE}" ]; then \
 		echo "Env variable 'REPO_TYPE' must be defined!"; \
 		exit 1; \
 	fi; \
-	# Set PRODUCT_NAME for the package in the repository.
-	if [ "$$(echo $(GC64) | sed 's/.*=//')" = ON ]; then                                                                                    \
-		PRODUCT_NAME=tarantool-gc64; \
+	# Use different repos for vanilla and GC64 version.
+	if [ "$$(echo ${GC64} | sed 's/.*=//')" = ON ]; then \
+		RWS_ENDPOINT=${RWS_BASE_URL}/${REPO_TYPE}/${TARANTOOL_SERIES}-gc64/${OS}/${DIST}; \
 	else \
-		PRODUCT_NAME=tarantool; \
+		RWS_ENDPOINT=${RWS_BASE_URL}/${REPO_TYPE}/${TARANTOOL_SERIES}/${OS}/${DIST}; \
 	fi; \
 	CURL_CMD="curl \
 		--location \
@@ -146,9 +137,9 @@ deploy:
 		--show-error \
 		--retry 5 \
 		--retry-delay 5 \
-		--request PUT ${RWS_ENDPOINT} \
+		--request PUT $${RWS_ENDPOINT} \
 		--user $${RWS_AUTH} \
-		--form product=$${PRODUCT_NAME}"; \
+		--form product=${PRODUCT_NAME}"; \
 	for f in $$(ls -I '*build*' -I '*.changes' ./build); do \
 		CURL_CMD="$${CURL_CMD} --form $$(basename $${f})=@./build/$${f}"; \
 	done; \
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index ae01332528fdd330896d5bc37b91a178b7fb9288..e635b6efc2dc54bf45d2b874ed84ff2520bf71a5 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -110,16 +110,7 @@ BuildRequires: python3-pyyaml
 # Install prove to run LuaJIT tests.
 BuildRequires: perl-Test-Harness
 
-# Set product name from env variable or use default "tarantool".
-# It is a temporary solution to define special name of the package
-# to "tarantool-gc64" in CI. It is required to set up Tarantool
-# with GC64 enabled by "yum install tarantool-gc64"
-%define _product %{getenv:PRODUCT_NAME}
-%if "%{_product}"
-Name: %{_product}
-%else
 Name: tarantool
-%endif
 # ${major}.${major}.${minor}.${patch}, e.g. 1.6.8.175
 # Version is updated automaically using git describe --long --always
 Version: 1.7.2.385