diff --git a/00-cpp_compat.patch b/00-cpp_compat.patch
index 1060f11..52818c4 100644
--- a/00-cpp_compat.patch
+++ b/00-cpp_compat.patch
@@ -1,5 +1,5 @@
---- a/epan/epan.h	2024-04-20 00:34:15.534364916 -0700
-+++ b/epan/epan.h	2024-04-20 00:34:25.094467480 -0700
+--- epan.h.old	2024-04-20 00:34:15.534364916 -0700
++++ epan.h	2024-04-20 00:34:25.094467480 -0700
 @@ -10,9 +10,6 @@
  #ifndef __EPAN_H__
  #define __EPAN_H__
diff --git a/01-radio_bearer_config.patch b/01-radio_bearer_config.patch
deleted file mode 100644
index b3444a4..0000000
--- a/01-radio_bearer_config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
-index fd478d8969..b3b89250e0 100644
---- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
-+++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf
-@@ -145,7 +145,7 @@ PH-TypeListMCG
- PH-TypeListSCG
- RA-ReportList-r16
- RACH-ConfigCommon
--RadioBearerConfig
-+RadioBearerConfig                  @radio_bearer_conf
- ReferenceTime-r16
- RRCReconfiguration                 @rrc_reconf
- RRCReconfigurationComplete
-diff --git a/epan/dissectors/packet-nr-rrc.c b/epan/dissectors/packet-nr-rrc.c
-index 75977474c0..cfa8602711 100644
---- a/epan/dissectors/packet-nr-rrc.c
-+++ b/epan/dissectors/packet-nr-rrc.c
-@@ -112214,6 +112214,7 @@ proto_register_nr_rrc(void) {
-   register_dissector("nr-rrc.ue_nr_cap", dissect_nr_rrc_UE_NR_Capability_PDU, proto_nr_rrc);
-   register_dissector("nr-rrc.sbcch.sl.bch", dissect_SBCCH_SL_BCH_Message_PDU, proto_nr_rrc);
-   register_dissector("nr-rrc.scch", dissect_SCCH_Message_PDU, proto_nr_rrc);
-+  register_dissector("nr-rrc.radio_bearer_conf", dissect_nr_rrc_RadioBearerConfig_PDU, proto_nr_rrc);
- 
- 
- /*--- End of included file: packet-nr-rrc-dis-reg.c ---*/
diff --git a/mobileinsight.def b/mobileinsight.def
index 810c4ab..84b3263 100644
--- a/mobileinsight.def
+++ b/mobileinsight.def
@@ -8,7 +8,6 @@ From: ubuntu:22.04
 
 %files
     00-cpp_compat.patch /build/00-cpp_compat.patch
-    01-radio_bearer_config.patch /build/01-radio_bearer_config.patch
 
 %post
     # Update and install dependencies
@@ -46,17 +45,15 @@ From: ubuntu:22.04
 
     # Download resources
     cd /build
-    wget "https://github.com/wireshark/wireshark/archive/refs/tags/v{{ WS_VER }}.tar.gz" \
-        -nv -O "wireshark-{{ WS_VER }}.tar.xz"
+    wget "http://www.mobileinsight.net/wireshark-{{ WS_VER }}-rbc-dissector.tar.xz" -nv \
+        -O "wireshark-{{ WS_VER }}.tar.xz"
     tar -xf "wireshark-{{ WS_VER }}.tar.xz"
     git clone "https://github.com/mobile-insight/mobileinsight-core.git"
     git -C mobileinsight-core checkout "{{ MI_COMMIT }}"
 
     # Compile and install wireshark
     cd "/build/wireshark-{{ WS_VER }}"
-    for patch in /build/*.patch; do
-        patch -p1 < "$patch"
-    done
+    patch epan/epan.h < /build/00-cpp_compat.patch
     cmake -DBUILD_wireshark=OFF .
     make -j "{{ NUM_THREADS }}"
     make install
diff --git a/with-spark.def b/with-spark.def
index 16cdf96..101bed4 100644
--- a/with-spark.def
+++ b/with-spark.def
@@ -1,16 +1,32 @@
 Bootstrap: localimage
 From: mobileinsight.sif
 
+%arguments
+    SPARK_URL="https://dlcdn.apache.org/spark/spark-3.5.1/spark-3.5.1-bin-hadoop3.tgz"
+
+%environment
+    export SPARK_HOME="/opt/spark"
+    export PATH="/opt/spark/sbin:/opt/spark/bin:$PATH"
+    export PYSPARK_PYTHON="/usr/bin/python3"
+    export SPARK_LOCAL_IP="127.0.0.1"
+
 %post
     # Update and install dependencies
+    mkdir -p /build
     export DEBIAN_FRONTEND=noninteractive
     apt-get update
     apt-get upgrade -y
     apt-get install -y \
-        python3-pandas \
         openjdk-8-jre-headless \
         scala
-    pip3 install pyspark[sql]==3.5.1 dill==0.3.8
+
+    # Download Spark
+    SPARK_TGZ="/build/$(basename "{{ SPARK_URL }}")"
+    cd /build
+    wget "{{ SPARK_URL }}" -nv -O "$SPARK_TGZ"
+    tar -xf "$SPARK_TGZ"
+    mv "$(echo $SPARK_TGZ | sed 's/\.tgz$//')" /opt/spark
 
     # Cleanup
     apt-get autoclean -y
+    rm -rf /build