diff --git a/Dockerfile b/Dockerfile
index 4d6ab8be..61071566 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ ARG KATALON_SOFTWARE_DIR=/opt
 # System Environment
 ENV KATALON_VERSION_FILE=$KATALON_ROOT_DIR/version
 ENV KATALON_AGENT_DIR=$KATALON_ROOT_DIR/agent
-ENV GRADLE_HOME=$KATALON_SOFTWARE_DIR/gradle
+ENV GRADLE_HOME=$KATALON_SOFTWARE_DIR/gradle-7
 ENV GRADLE_BIN=$GRADLE_HOME/bin
 
 # Katalon Environment
@@ -60,7 +60,6 @@ COPY --from=build /katalon/bin/cli-linux-x64 *.sh ./
 # Copy script files and setup
 WORKDIR $KATALON_SCRIPT_DIR
 COPY ./docker/scripts/wrap_chrome_binary.sh wrap_chrome_binary.sh
-# COPY ./docker/scripts/setup_environment.sh setup_environment.sh
 COPY ./docker/scripts/upgrade_environment.sh upgrade_environment.sh
 COPY ./docker/scripts/setup_agent.sh setup_agent.sh
 COPY ./docker/scripts/setup.sh setup.sh
diff --git a/docker/scripts/setup_environment.sh b/docker/scripts/setup_environment.sh
index 9bb7b675..5e72b22f 100755
--- a/docker/scripts/setup_environment.sh
+++ b/docker/scripts/setup_environment.sh
@@ -60,8 +60,6 @@ unzip $gradle_package
 ls
 rm $gradle_package
 mv $gradle_unzipped_package /opt/gradle-7
-export GRADLE_HOME=/opt/gradle-7
-ls $GRADLE_HOME
 
 chmod -R 777 $KATALON_ROOT_DIR
 chmod -R 777 $KATALON_SOFTWARE_DIR