diff --git a/Dockerfile b/Dockerfile
index 7a3b64ed..a968388c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 ARG BASE_IMAGE=base-charmed-spark:latest
 FROM $BASE_IMAGE
 # Provide Default Entrypoint for Pebble
-ENTRYPOINT [ "/bin/pebble", "enter", "--verbose", "--args", "sparkd" ]
\ No newline at end of file
+ENTRYPOINT [ "/opt/pebble/bin/pebble", "enter", "--verbose", "--args", "sparkd" ]
\ No newline at end of file
diff --git a/files/spark/bin/sparkd.sh b/files/spark/bin/sparkd.sh
index 57214b73..d0a6b602 100644
--- a/files/spark/bin/sparkd.sh
+++ b/files/spark/bin/sparkd.sh
@@ -1,15 +1,5 @@
 #!/bin/bash
 
-function finish {
-  if [ $? -ne 0 ]
-  then
-    kill -1 1
-    sleep 1
-  fi
-}
-trap finish EXIT
-
-
 FLAVOUR=$1
 
 echo "Running script with ${FLAVOUR} flavour"
diff --git a/rockcraft.yaml b/rockcraft.yaml
index a2263d3b..7251ca80 100644
--- a/rockcraft.yaml
+++ b/rockcraft.yaml
@@ -4,7 +4,7 @@ description: Spark ROCK
 license: Apache-2.0
 
 version: "3.4.1"
-base: ubuntu:22.04
+base: ubuntu@22.04
 platforms:
   amd64:
 
@@ -15,7 +15,7 @@ environment:
   SPARK_CONFS: /etc/spark8t/conf
   JAVA_HOME: /usr/lib/jvm/java-11-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
+  PATH: /opt/pebble/bin:/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
   HOME: /var/lib/spark
   KUBECONFIG: /var/lib/spark/.kube/config
   SPARK_USER_DATA: /var/lib/spark
@@ -182,6 +182,13 @@ parts:
       - opt/spark-client/python/bin/spark-client.spark-shell
       - opt/spark-client/python/bin/spark-client.spark-submit
 
+  new-pebble:
+    plugin: nil
+    stage-snaps:
+      - pebble/latest/candidate
+    organize:
+      bin: opt/pebble/bin/
+
   user-setup:
     plugin: nil
     after: [ charmed-spark ]