diff --git a/files/spark/bin/thrift-server.sh b/files/spark/bin/thrift-server.sh
deleted file mode 100644
index 3a9c6b00..00000000
--- a/files/spark/bin/thrift-server.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pushd /opt/spark
-/opt/spark/sbin/start-thriftserver.sh --properties-file ${SPARK_PROPERTIES_FILE}
\ No newline at end of file
diff --git a/files/spark/conf/kyuubi-env.sh b/files/spark/conf/kyuubi-env.sh
deleted file mode 100644
index ed95fdfc..00000000
--- a/files/spark/conf/kyuubi-env.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
-export SPARK_HOME="/opt/spark/"
-export SPARK_CONF_DIR="/etc/spark8t/conf"
diff --git a/rockcraft.yaml b/rockcraft.yaml
index 186bf74e..2d2c841d 100644
--- a/rockcraft.yaml
+++ b/rockcraft.yaml
@@ -24,6 +24,7 @@ run_user: _daemon_
 environment:
   SPARK_HOME: /opt/spark
   SPARK_CONFS: /etc/spark8t/conf
+  SPARK_CONF_DIR: /etc/spark8t/conf
   JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
   PYTHONPATH: /opt/spark/python:/opt/spark8t/python/dist:/usr/lib/python3.10/site-packages
   PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/spark:/opt/spark/bin:/opt/spark/python/bin:/opt/spark-client/python/bin
@@ -193,10 +194,8 @@ parts:
     source: files/spark
     organize:
       conf/spark-defaults.conf: etc/spark8t/conf/spark-defaults.conf
-      conf/kyuubi-env.sh: opt/kyuubi/conf/kyuubi-env.sh
       bin/sparkd.sh: opt/pebble/sparkd.sh
       bin/history-server.sh: opt/pebble/history-server.sh
-      bin/thrift-server.sh: opt/pebble/thrift-server.sh
       bin/kyuubi.sh: opt/pebble/kyuubi.sh
       bin/spark-client.pyspark: opt/spark-client/python/bin/spark-client.pyspark
       bin/spark-client.spark-sql: opt/spark-client/python/bin/spark-client.spark-sql
@@ -207,9 +206,7 @@ parts:
       - etc/spark8t/conf/
       - opt/pebble/sparkd.sh
       - opt/pebble/history-server.sh
-      - opt/pebble/thrift-server.sh
       - opt/pebble/kyuubi.sh
-      - opt/kyuubi/conf/kyuubi-env.sh
       - opt/spark-client/python/bin/spark-client.pyspark
       - opt/spark-client/python/bin/spark-client.spark-sql
       - opt/spark-client/python/bin/spark-client.service-account-registry