diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5b3b08..9a98dfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
           profile: minimal
           components: rustfmt, clippy
       - run: cargo install --force cargo-hakari
-      - run: cargo fmt --all -- --check
+      - run: cargo +nightly fmt --all -- --check
       - run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings
       - run: cargo hakari verify
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1361963
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+.DEFAULT_GOAL := all
+
+.PHONY: all fmt build test
+
+all: fmt
+
+fmt:
+	(cargo +nightly fmt)
+
+build:
+	(cargo build)
+
+test:
+	(cargo test)
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index e308d47..0000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2022-08-25
diff --git a/src/hstreamdb-pb/protocol b/src/hstreamdb-pb/protocol
index 25f7649..4d88544 160000
--- a/src/hstreamdb-pb/protocol
+++ b/src/hstreamdb-pb/protocol
@@ -1 +1 @@
-Subproject commit 25f764901ab7eb1606f64d05c3ca65c15e698d81
+Subproject commit 4d8854434e7eed83a9b7db52943abe9bd32c7cfa
diff --git a/src/hstreamdb/src/channel_provider.rs b/src/hstreamdb/src/channel_provider.rs
index 7c1c248..656dd5c 100644
--- a/src/hstreamdb/src/channel_provider.rs
+++ b/src/hstreamdb/src/channel_provider.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::default::default;
 use std::iter::FromIterator;
 
 use hstreamdb_pb::h_stream_api_client::HStreamApiClient;
@@ -80,7 +79,7 @@ pub struct ChannelProviderSettingsBuilder(ChannelProviderSettings);
 
 impl ChannelProviderSettings {
     pub fn builder() -> ChannelProviderSettingsBuilder {
-        ChannelProviderSettingsBuilder(default())
+        ChannelProviderSettingsBuilder(ChannelProviderSettings::default())
     }
 }
 
diff --git a/src/hstreamdb/src/lib.rs b/src/hstreamdb/src/lib.rs
index 75c2e71..dbf713a 100644
--- a/src/hstreamdb/src/lib.rs
+++ b/src/hstreamdb/src/lib.rs
@@ -1,6 +1,3 @@
-#![feature(default_free_fn)]
-#![feature(map_first_last)]
-
 pub mod appender;
 mod channel_provider;
 pub mod client;
diff --git a/src/hstreamdb/src/producer.rs b/src/hstreamdb/src/producer.rs
index 9efeed1..0f0a6d9 100644
--- a/src/hstreamdb/src/producer.rs
+++ b/src/hstreamdb/src/producer.rs
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::default::default;
 use std::error::Error;
 use std::fmt::{Debug, Display};
 use std::io::Write;
@@ -69,7 +68,7 @@ pub struct FlushSettings {
 
 impl FlushSettings {
     pub fn builder() -> FlushSettingsBuilder {
-        default()
+        FlushSettingsBuilder::default()
     }
 }
 
@@ -241,7 +240,7 @@ impl Producer {
             }
             Ok(shard_id) => match self.shard_buffer.get_mut(&shard_id) {
                 None => {
-                    let mut buffer_state: BufferState = default();
+                    let mut buffer_state: BufferState = BufferState::default();
                     buffer_state.modify(&record);
                     self.shard_buffer_state.insert(shard_id, buffer_state);
                     self.shard_buffer.insert(shard_id, vec![record]);