diff --git a/Jenkinsfile.public b/Jenkinsfile.public
index 2ff06f372..570fc68de 100644
--- a/Jenkinsfile.public
+++ b/Jenkinsfile.public
@@ -71,7 +71,7 @@ pipeline {
                 stage('go -race gateway') {
                     steps {
                         // install gateway for storj-sim
-                        sh 'go install -race -v storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de'
+                        sh 'go install -race -v storj.io/gateway@main'
                     }
                 }
 
diff --git a/Makefile b/Makefile
index 9c905ed49..b0518b90d 100644
--- a/Makefile
+++ b/Makefile
@@ -94,8 +94,8 @@ install-sim: ## install storj-sim
 		storj.io/storj/cmd/multinode
 
 	## install exact version of storj/gateway
-	## TODO replace 'main' with 'latest' when gateway with multipart will be released
-	go install -race -v storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de
+	## TODO(artur): replace 'main' with 'latest' after the gateway is being released again
+	go install -race -v storj.io/gateway@main
 
 ##@ Test
 
diff --git a/scripts/test-sim-backwards.sh b/scripts/test-sim-backwards.sh
index 288c99a5a..b46096be3 100755
--- a/scripts/test-sim-backwards.sh
+++ b/scripts/test-sim-backwards.sh
@@ -68,7 +68,6 @@ EOF
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-sed -i -e 's#storj.io/gateway@main#storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de#g' "$RELEASE_DIR"/Makefile
 GOBIN="$RELEASE_DIR"/bin make -C "$RELEASE_DIR" install-sim
 GOBIN="$BRANCH_DIR"/bin  make -C "$BRANCH_DIR" install-sim
 
diff --git a/scripts/tests/rollingupgrade/test-sim-rolling-upgrade.sh b/scripts/tests/rollingupgrade/test-sim-rolling-upgrade.sh
index 2dce5a48a..6ebc291a5 100755
--- a/scripts/tests/rollingupgrade/test-sim-rolling-upgrade.sh
+++ b/scripts/tests/rollingupgrade/test-sim-rolling-upgrade.sh
@@ -114,12 +114,8 @@ install_sim(){
             go build -race -v -o ${bin_dir}/gateway storj.io/storj/cmd/gateway >/dev/null 2>&1
         popd
     else
-        rm -rf .build/gateway-tmp
-        mkdir -p .build/gateway-tmp
-        pushd .build/gateway-tmp
-        	## TODO replace 'main' with 'latest' when gateway with multipart will be released
-            go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de
-        popd
+        # TODO(artur): replace 'main' with 'latest' after the gateway is being released again
+        GOBIN=${bin_dir} go install -race storj.io/gateway@main
     fi
 
     if [ -d "${work_dir}/cmd/multinode" ]; then
diff --git a/scripts/tests/testversions/test-sim-versions.sh b/scripts/tests/testversions/test-sim-versions.sh
index 8c6939b55..c2e0d9cbb 100755
--- a/scripts/tests/testversions/test-sim-versions.sh
+++ b/scripts/tests/testversions/test-sim-versions.sh
@@ -91,10 +91,8 @@ install_sim(){
     if [ -d "${work_dir}/cmd/gateway" ]; then
         (cd ${work_dir}/cmd/gateway && go build -race -v -o ${bin_dir}/gateway storj.io/storj/cmd/gateway >/dev/null 2>&1)
     else
-	mkdir -p ${work_dir}/build/gateway-tmp
-    ## TODO replace 'main' with 'latest' when gateway with multipart will be released
-	(cd ${work_dir}/build/gateway-tmp && go mod init gatewaybuild && GOBIN=${bin_dir} GO111MODULE=on go get storj.io/gateway@5da0ff79b964560906bab67ce6f1eb16b89a93de;)
-        rm -rf ${work_dir}/build/gateway-tmp
+        # TODO(artur): replace 'main' with 'latest' after the gateway is being released again
+        GOBIN=${bin_dir} go install -race storj.io/gateway@main
     fi
     if [ -d "${work_dir}/cmd/multinode" ]; then
         # as storj-sim is most likely installed from $PWD and contains storj-sim version which requires multinode