diff --git a/peach-lib/src/sbot.rs b/peach-lib/src/sbot.rs
index 070c8e7..565d16e 100644
--- a/peach-lib/src/sbot.rs
+++ b/peach-lib/src/sbot.rs
@@ -270,11 +270,11 @@ pub async fn init_sbot() -> Result<TildeClient, PeachError> {
     };
 
     debug!("Initialising an sbot client with configuration parameters");
+    let database_path = format!("{}/db.sqlite", config_manager::get_config_value("TILDE_SBOT_DATADIR")?);
     let sbot_client = TildeClient {
             port: sbot_config.ssb_port,
             tilde_binary_path: config_manager::get_config_value("TILDE_BINARY_PATH")?,
-            tilde_wrapper_path: config_manager::get_config_value("TILDE_WRAPPER_PATH")?,
-            tilde_config_path: config_manager::get_config_value("TILDE_CONFIG_PATH")?,
+            tilde_database_path: database_path,
         };
     Ok(sbot_client)
 }
diff --git a/run-tilde-sbot.sh b/run-tilde-sbot.sh
index c22aab3..7a17c10 100755
--- a/run-tilde-sbot.sh
+++ b/run-tilde-sbot.sh
@@ -5,14 +5,12 @@ set -e
 
 # Usage check
 if [ "$#" -lt 2 ]; then
-  echo "Usage: $0 <CONFIG_FILE> <TILDEFRIENDS_PATH> <ADDITIONAL ARGUMENTS>"
+  echo "Usage: $0 <CONFIG_FILE> <TILDEFRIENDS_PATH>"
   exit 1
 fi
 
 CONFIG_FILE="$1"
 TILDEFRIENDS_PATH="$2"
-shift 2
-EXTRA_ARGS=("$@")
 
 
 # Extract network_key (if it exists)
@@ -33,16 +31,11 @@ echo "ARGS: $ARGS"
 [ -n "$NETWORK_KEY" ] && echo "NETWORK_KEY: $NETWORK_KEY"
 [ -n "$DATABASE_DIRECTORY" ] && echo "DATABASE_DIRECTORY: $DATABASE_DIRECTORY"
 
-CMD="\"$TILDEFRIENDS_PATH\""
+CMD="\"$TILDEFRIENDS_PATH\" run"
 [ -n "$ARGS" ] && CMD="$CMD -a \"$ARGS\""
 [ -n "$NETWORK_KEY" ] && CMD="$CMD -k \"$NETWORK_KEY\""
 [ -n "$DATABASE_DIRECTORY" ] && CMD="$CMD -d \"$DATABASE_DIRECTORY/db.sqlite\""
 
-# Append extra arguments
-for ARG in "${EXTRA_ARGS[@]}"; do
-  CMD="$CMD \"$ARG\""
-done
-
 echo "Running command:"
 echo "$CMD"
 
diff --git a/tilde-client/src/lib.rs b/tilde-client/src/lib.rs
index 75a25f4..6b3b3d0 100644
--- a/tilde-client/src/lib.rs
+++ b/tilde-client/src/lib.rs
@@ -11,8 +11,7 @@ mod error;
 pub struct TildeClient {
     pub port: String,
     pub tilde_binary_path: String,
-    pub tilde_wrapper_path: String,
-    pub tilde_config_path: String,
+    pub tilde_database_path: String,
 }
 pub fn init_sbot() {
     println!("++ init sbot!");
@@ -21,11 +20,10 @@ pub fn init_sbot() {
 impl TildeClient {
 
     pub fn run_tilde_command(&self, args: Vec<&str>) -> Result<String, TildeError> {
-        let mut command = Command::new(&self.tilde_wrapper_path);
-        // wrapper config_file binary_path <additional args
-        let mut full_args = vec![self.tilde_config_path.as_str(), self.tilde_binary_path.as_str()];
-        full_args.extend(args);
-
+        let mut command = Command::new(&self.tilde_binary_path);
+        let mut full_args = args.clone();
+        full_args.push("-d");
+        full_args.push(self.tilde_database_path.as_str());
         command.args(full_args);
         let output = command
             .output().map_err(|e| TildeError {